Messages in this thread | | | Date | Thu, 19 Jan 2023 10:14:23 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the iversion tree with the vfs-idmapping tree |
| |
Hi all,
Today's linux-next merge of the iversion tree got a conflict in:
fs/stat.c
between commit:
9a516a5ea11a ("fs: port ->getattr() to pass mnt_idmap")
from the vfs-idmapping tree and commit:
d84b698e9362 ("vfs: plumb i_version handling into struct kstat")
from the iversion 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/stat.c index f540047e1177,06fd3fc1ab84..000000000000 --- a/fs/stat.c +++ b/fs/stat.c @@@ -122,12 -120,17 +123,17 @@@ int vfs_getattr_nosec(const struct pat stat->attributes_mask |= (STATX_ATTR_AUTOMOUNT | STATX_ATTR_DAX); + if ((request_mask & STATX_CHANGE_COOKIE) && IS_I_VERSION(inode)) { + stat->result_mask |= STATX_CHANGE_COOKIE; + stat->change_cookie = inode_query_iversion(inode); + } + - mnt_userns = mnt_user_ns(path->mnt); + idmap = mnt_idmap(path->mnt); if (inode->i_op->getattr) - return inode->i_op->getattr(mnt_userns, path, stat, + return inode->i_op->getattr(idmap, path, stat, request_mask, query_flags); - generic_fillattr(mnt_userns, inode, stat); + generic_fillattr(idmap, inode, stat); return 0; } EXPORT_SYMBOL(vfs_getattr_nosec); [unhandled content-type:application/pgp-signature] | |