fs: move generic stat response attr handling to vfs_getattr_nosec (801e5237) · Commits · 戴 / test

generic_fillattr is an optional helper that isn't used by all file systems, move handling purely based on inode flags to vfs_getattr_nosec, which is common code. This fixes setting this flag for file systems not using generic_fillattr like xfs. Signed-off-by:

Christoph Hellwig <hch@lst.de> Signed-off-by:

Al Viro <viro@zeniv.linux.org.uk>

fs/stat.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -45,11 +45,6 @@ void generic_fillattr(struct inode inode, struct kstat stat)
		stat->ctime = inode->i_ctime;
		stat->blksize = i_blocksize(inode);
		stat->blocks = inode->i_blocks;

		if (IS_NOATIME(inode))
		stat->result_mask &= ~STATX_ATIME;
		if (IS_AUTOMOUNT(inode))
		stat->attributes \|= STATX_ATTR_AUTOMOUNT;
		}
		EXPORT_SYMBOL(generic_fillattr);

		@@ -75,6 +70,13 @@ int vfs_getattr_nosec(const struct path path, struct kstat stat,
		stat->result_mask \|= STATX_BASIC_STATS;
		request_mask &= STATX_ALL;
		query_flags &= KSTAT_QUERY_FLAGS;

		/* allow the fs to override these if it really wants to */
		if (IS_NOATIME(inode))
		stat->result_mask &= ~STATX_ATIME;
		if (IS_AUTOMOUNT(inode))
		stat->attributes \|= STATX_ATTR_AUTOMOUNT;

		if (inode->i_op->getattr)
		return inode->i_op->getattr(path, stat, request_mask,
		query_flags);

Admin message