linux-next: manual merge of the vfs-brauner tree with the f2fs tree

linux-next: manual merge of the vfs-brauner tree with the f2fs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1336 bytes --]

Hi all,

Today's linux-next merge of the vfs-brauner tree got a conflict in:

  fs/f2fs/super.c

between commit:

  5fa6a97d2784 ("f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup")

from the f2fs tree and commit:

  512383ae4910 ("f2fs: port block device access to files")

from the vfs-brauner tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/f2fs/super.c
index 09ffdd554f9c,09e82624eff5..000000000000
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@@ -4206,9 -4265,9 +4206,9 @@@ static int f2fs_scan_devices(struct f2f
  			} else {
  				FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;
  				FDEV(i).end_blk = FDEV(i).start_blk +
 -					(FDEV(i).total_segments <<
 -					sbi->log_blocks_per_seg) - 1;
 +						SEGS_TO_BLKS(sbi,
 +						FDEV(i).total_segments) - 1;
- 				FDEV(i).bdev_handle = bdev_open_by_path(
+ 				FDEV(i).bdev_file = bdev_file_open_by_path(
  					FDEV(i).path, mode, sbi->sb, NULL);
  			}
  		}

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the vfs-brauner tree with the f2fs tree

[Jaegeuk Kim]

On 02/29, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
> 
>   fs/f2fs/super.c
> 
> between commit:
> 
>   5fa6a97d2784 ("f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup")

fyi; I dropped the above commit in -dev.

> 
> from the f2fs tree and commit:
> 
>   512383ae4910 ("f2fs: port block device access to files")
> 
> from the vfs-brauner tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc fs/f2fs/super.c
> index 09ffdd554f9c,09e82624eff5..000000000000
> --- a/fs/f2fs/super.c
> +++ b/fs/f2fs/super.c
> @@@ -4206,9 -4265,9 +4206,9 @@@ static int f2fs_scan_devices(struct f2f
>   			} else {
>   				FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;
>   				FDEV(i).end_blk = FDEV(i).start_blk +
>  -					(FDEV(i).total_segments <<
>  -					sbi->log_blocks_per_seg) - 1;
>  +						SEGS_TO_BLKS(sbi,
>  +						FDEV(i).total_segments) - 1;
> - 				FDEV(i).bdev_handle = bdev_open_by_path(
> + 				FDEV(i).bdev_file = bdev_file_open_by_path(
>   					FDEV(i).path, mode, sbi->sb, NULL);
>   			}
>   		}

Re: linux-next: manual merge of the vfs-brauner tree with the f2fs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1883 bytes --]

Hi Jaegeuk,

On Thu, 29 Feb 2024 09:13:28 -0800 Jaegeuk Kim <jaegeuk@kernel.org> wrote:
>
> On 02/29, Stephen Rothwell wrote:
> > 
> > Today's linux-next merge of the vfs-brauner tree got a conflict in:
> > 
> >   fs/f2fs/super.c
> > 
> > between commit:
> > 
> >   5fa6a97d2784 ("f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup")  
> 
> fyi; I dropped the above commit in -dev.

And it seems to have come back as commit

  45809cd3bdac ("f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup")

(which is fine, but the conflict has returned).

> > from the f2fs tree and commit:
> > 
> >   512383ae4910 ("f2fs: port block device access to files")
> > 
> > from the vfs-brauner tree.
> > 
> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging.  You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
> > 
> > -- 
> > Cheers,
> > Stephen Rothwell
> > 
> > diff --cc fs/f2fs/super.c
> > index 09ffdd554f9c,09e82624eff5..000000000000
> > --- a/fs/f2fs/super.c
> > +++ b/fs/f2fs/super.c
> > @@@ -4206,9 -4265,9 +4206,9 @@@ static int f2fs_scan_devices(struct f2f
> >   			} else {
> >   				FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;
> >   				FDEV(i).end_blk = FDEV(i).start_blk +
> >  -					(FDEV(i).total_segments <<
> >  -					sbi->log_blocks_per_seg) - 1;
> >  +						SEGS_TO_BLKS(sbi,
> >  +						FDEV(i).total_segments) - 1;
> > - 				FDEV(i).bdev_handle = bdev_open_by_path(
> > + 				FDEV(i).bdev_file = bdev_file_open_by_path(
> >   					FDEV(i).path, mode, sbi->sb, NULL);
> >   			}
> >   		}  

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the vfs-brauner tree with the f2fs tree

[Jaegeuk Kim]

On 03/05, Stephen Rothwell wrote:
> Hi Jaegeuk,
> 
> On Thu, 29 Feb 2024 09:13:28 -0800 Jaegeuk Kim <jaegeuk@kernel.org> wrote:
> >
> > On 02/29, Stephen Rothwell wrote:
> > > 
> > > Today's linux-next merge of the vfs-brauner tree got a conflict in:
> > > 
> > >   fs/f2fs/super.c
> > > 
> > > between commit:
> > > 
> > >   5fa6a97d2784 ("f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup")  
> > 
> > fyi; I dropped the above commit in -dev.
> 
> And it seems to have come back as commit
> 
>   45809cd3bdac ("f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup")
> 
> (which is fine, but the conflict has returned).

Yeah.. :P

> 
> > > from the f2fs tree and commit:
> > > 
> > >   512383ae4910 ("f2fs: port block device access to files")
> > > 
> > > from the vfs-brauner tree.
> > > 
> > > I fixed it up (see below) and can carry the fix as necessary. This
> > > is now fixed as far as linux-next is concerned, but any non trivial
> > > conflicts should be mentioned to your upstream maintainer when your tree
> > > is submitted for merging.  You may also want to consider cooperating
> > > with the maintainer of the conflicting tree to minimise any particularly
> > > complex conflicts.
> > > 
> > > -- 
> > > Cheers,
> > > Stephen Rothwell
> > > 
> > > diff --cc fs/f2fs/super.c
> > > index 09ffdd554f9c,09e82624eff5..000000000000
> > > --- a/fs/f2fs/super.c
> > > +++ b/fs/f2fs/super.c
> > > @@@ -4206,9 -4265,9 +4206,9 @@@ static int f2fs_scan_devices(struct f2f
> > >   			} else {
> > >   				FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;
> > >   				FDEV(i).end_blk = FDEV(i).start_blk +
> > >  -					(FDEV(i).total_segments <<
> > >  -					sbi->log_blocks_per_seg) - 1;
> > >  +						SEGS_TO_BLKS(sbi,
> > >  +						FDEV(i).total_segments) - 1;
> > > - 				FDEV(i).bdev_handle = bdev_open_by_path(
> > > + 				FDEV(i).bdev_file = bdev_file_open_by_path(
> > >   					FDEV(i).path, mode, sbi->sb, NULL);
> > >   			}
> > >   		}  
> 
> -- 
> Cheers,
> Stephen Rothwell

Re: linux-next: manual merge of the vfs-brauner tree with the f2fs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1564 bytes --]

Hi all,

On Thu, 29 Feb 2024 10:41:40 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
> 
>   fs/f2fs/super.c
> 
> between commit:
> 
>   5fa6a97d2784 ("f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup")
> 
> from the f2fs tree and commit:
> 
>   512383ae4910 ("f2fs: port block device access to files")
> 
> from the vfs-brauner tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> diff --cc fs/f2fs/super.c
> index 09ffdd554f9c,09e82624eff5..000000000000
> --- a/fs/f2fs/super.c
> +++ b/fs/f2fs/super.c
> @@@ -4206,9 -4265,9 +4206,9 @@@ static int f2fs_scan_devices(struct f2f
>   			} else {
>   				FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;
>   				FDEV(i).end_blk = FDEV(i).start_blk +
>  -					(FDEV(i).total_segments <<
>  -					sbi->log_blocks_per_seg) - 1;
>  +						SEGS_TO_BLKS(sbi,
>  +						FDEV(i).total_segments) - 1;
> - 				FDEV(i).bdev_handle = bdev_open_by_path(
> + 				FDEV(i).bdev_file = bdev_file_open_by_path(
>   					FDEV(i).path, mode, sbi->sb, NULL);
>   			}
>   		}

This is now a conflict between the f2fs tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the vfs-brauner tree with the f2fs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1112 bytes --]

Hi all,

Today's linux-next merge of the vfs-brauner tree got a conflict in:

  fs/f2fs/xattr.c

between commit:

  8874ad7dae8d ("f2fs: fix to update i_ctime in __f2fs_setxattr()")

from the f2fs tree and commit:

  c62ebd3501cc ("f2fs: convert to ctime accessor functions")

from the vfs-brauner tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/f2fs/xattr.c
index 9cc1ca75b2da,4ae93e1df421..000000000000
--- a/fs/f2fs/xattr.c
+++ b/fs/f2fs/xattr.c
@@@ -766,8 -767,7 +766,8 @@@ same
  		clear_inode_flag(inode, FI_ACL_MODE);
  	}
  
- 	inode->i_ctime = current_time(inode);
++	inode_set_ctime_current(inode);
 +	f2fs_mark_inode_dirty_sync(inode, true);
  exit:
  	kfree(base_addr);
  	return error;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the vfs-brauner tree with the f2fs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1715 bytes --]

Hi all,

Today's linux-next merge of the vfs-brauner tree got a conflict in:

  fs/f2fs/super.c

between commit:

  51bf8d3c8199 ("f2fs: don't reopen the main block device in f2fs_scan_devices")

from the f2fs tree and commit:

  2ea6f68932f7 ("fs: use the super_block as holder when mounting file systems")

from the vfs-brauner tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/f2fs/super.c
index a067466a694c,aa1f9a3a8037..000000000000
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@@ -1561,8 -1561,7 +1561,8 @@@ static void destroy_device_list(struct 
  	int i;
  
  	for (i = 0; i < sbi->s_ndevs; i++) {
 -		blkdev_put(FDEV(i).bdev, sbi->sb);
 +		if (i > 0)
- 			blkdev_put(FDEV(i).bdev, sbi->sb->s_type);
++			blkdev_put(FDEV(i).bdev, sbi->sb);
  #ifdef CONFIG_BLK_DEV_ZONED
  		kvfree(FDEV(i).blkz_seq);
  #endif
@@@ -4218,9 -4215,9 +4218,9 @@@ static int f2fs_scan_devices(struct f2f
  				FDEV(i).end_blk = FDEV(i).start_blk +
  					(FDEV(i).total_segments <<
  					sbi->log_blocks_per_seg) - 1;
 +				FDEV(i).bdev = blkdev_get_by_path(FDEV(i).path,
- 					mode, sbi->sb->s_type, NULL);
++					mode, sbi->sb, NULL);
  			}
 -			FDEV(i).bdev = blkdev_get_by_path(FDEV(i).path, mode,
 -							  sbi->sb, NULL);
  		}
  		if (IS_ERR(FDEV(i).bdev))
  			return PTR_ERR(FDEV(i).bdev);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]