Messages in this thread | | | Date | Tue, 15 Aug 2023 11:20:23 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the vfs-brauner tree with the btrfs tree |
| |
Hi all,
Today's linux-next merge of the vfs-brauner tree got a conflict in:
fs/btrfs/inode.c
between commit:
ea6aa58a9229 ("btrfs: copy dir permission and time when creating a stub subvolume")
from the btrfs tree and commit:
2a9462de4352 ("btrfs: convert to ctime accessor functions")
from the vfs-brauner tree.
I fixed it up (I think - 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/btrfs/inode.c index 06c9ad527458,db7e1a19bb67..000000000000 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@@ -5558,12 -5757,9 +5555,11 @@@ static struct inode *new_simple_dir(str inode->i_opflags &= ~IOP_XATTR; inode->i_fop = &simple_dir_operations; inode->i_mode = S_IFDIR | S_IRUGO | S_IWUSR | S_IXUGO; - inode->i_mtime = current_time(inode); + inode->i_mtime = inode_set_ctime_current(inode); - inode->i_atime = inode->i_mtime; + inode->i_atime = dir->i_atime; - inode->i_ctime = dir->i_ctime; BTRFS_I(inode)->i_otime = inode->i_mtime; + inode->i_uid = dir->i_uid; + inode->i_gid = dir->i_gid; return inode; } [unhandled content-type:application/pgp-signature] | |