Commit 0d72b928 authored Aug 07, 2023 by Jeff Layton Committed by Christian Brauner Aug 09, 2023

fs: pass the request_mask to generic_fillattr



generic_fillattr just fills in the entire stat struct indiscriminately
today, copying data from the inode. There is at least one attribute
(STATX_CHANGE_COOKIE) that can have side effects when it is reported,
and we're looking at adding more with the addition of multigrain
timestamps.

Add a request_mask argument to generic_fillattr and have most callers
just pass in the value that is passed to getattr. Have other callers
(e.g. ksmbd) just pass in STATX_BASIC_STATS. Also move the setting of
STATX_CHANGE_COOKIE into generic_fillattr.

Acked-by: Joseph Qi <joseph.qi@linux.alibaba.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: "Paulo Alcantara (SUSE)" <pc@manguebit.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Message-Id: <20230807-mgctime-v7-2-d1dec143a704@kernel.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>

parent b3030e4f

fs/9p/vfs_inode.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1016,7 +1016,7 @@ v9fs_vfs_getattr(struct mnt_idmap idmap, const struct path path,
		p9_debug(P9_DEBUG_VFS, "dentry: %p\n", dentry);
		v9ses = v9fs_dentry2v9ses(dentry);
		if (v9ses->cache & (CACHE_META\|CACHE_LOOSE)) {
		generic_fillattr(&nop_mnt_idmap, inode, stat);
		generic_fillattr(&nop_mnt_idmap, request_mask, inode, stat);
		return 0;
		} else if (v9ses->cache & CACHE_WRITEBACK) {
		if (S_ISREG(inode->i_mode)) {
		@@ -1037,7 +1037,7 @@ v9fs_vfs_getattr(struct mnt_idmap idmap, const struct path path,
		return PTR_ERR(st);

		v9fs_stat2inode(st, d_inode(dentry), dentry->d_sb, 0);
		generic_fillattr(&nop_mnt_idmap, d_inode(dentry), stat);
		generic_fillattr(&nop_mnt_idmap, request_mask, d_inode(dentry), stat);

		p9stat_free(st);
		kfree(st);

fs/9p/vfs_inode_dotl.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -451,7 +451,7 @@ v9fs_vfs_getattr_dotl(struct mnt_idmap *idmap,
		p9_debug(P9_DEBUG_VFS, "dentry: %p\n", dentry);
		v9ses = v9fs_dentry2v9ses(dentry);
		if (v9ses->cache & (CACHE_META\|CACHE_LOOSE)) {
		generic_fillattr(&nop_mnt_idmap, inode, stat);
		generic_fillattr(&nop_mnt_idmap, request_mask, inode, stat);
		return 0;
		} else if (v9ses->cache) {
		if (S_ISREG(inode->i_mode)) {
		@@ -476,7 +476,7 @@ v9fs_vfs_getattr_dotl(struct mnt_idmap *idmap,
		return PTR_ERR(st);

		v9fs_stat2inode_dotl(st, d_inode(dentry), 0);
		generic_fillattr(&nop_mnt_idmap, d_inode(dentry), stat);
		generic_fillattr(&nop_mnt_idmap, request_mask, d_inode(dentry), stat);
		/* Change block size to what the server returned */
		stat->blksize = st->st_blksize;

fs/afs/inode.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -773,7 +773,7 @@ int afs_getattr(struct mnt_idmap idmap, const struct path path,

		do {
		read_seqbegin_or_lock(&vnode->cb_lock, &seq);
		generic_fillattr(&nop_mnt_idmap, inode, stat);
		generic_fillattr(&nop_mnt_idmap, request_mask, inode, stat);
		if (test_bit(AFS_VNODE_SILLY_DELETED, &vnode->flags) &&
		stat->nlink > 0)
		stat->nlink -= 1;

fs/btrfs/inode.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -8746,7 +8746,7 @@ static int btrfs_getattr(struct mnt_idmap *idmap,
		STATX_ATTR_IMMUTABLE \|
		STATX_ATTR_NODUMP);

		generic_fillattr(idmap, inode, stat);
		generic_fillattr(idmap, request_mask, inode, stat);
		stat->dev = BTRFS_I(inode)->root->anon_dev;

		spin_lock(&BTRFS_I(inode)->lock);

fs/ceph/inode.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2467,7 +2467,7 @@ int ceph_getattr(struct mnt_idmap idmap, const struct path path,
		return err;
		}

		generic_fillattr(&nop_mnt_idmap, inode, stat);
		generic_fillattr(&nop_mnt_idmap, request_mask, inode, stat);
		stat->ino = ceph_present_inode(inode);

		/*