Commit a528d35e authored by David Howells's avatar David Howells Committed by Al Viro

statx: Add a system call to make enhanced file info available

Add a system call to make extended file information available, including
file creation and some attribute flags where available through the
underlying filesystem.

The getattr inode operation is altered to take two additional arguments: a
u32 request_mask and an unsigned int flags that indicate the
synchronisation mode.  This change is propagated to the vfs_getattr*()
function.

Functions like vfs_stat() are now inline wrappers around new functions
vfs_statx() and vfs_statx_fd() to reduce stack usage.

========
OVERVIEW
========

The idea was initially proposed as a set of xattrs that could be retrieved
with getxattr(), but the general preference proved to be for a new syscall
with an extended stat structure.

A number of requests were gathered for features to be included.  The
following have been included:

 (1) Make the fields a consistent size on all arches and make them large.

 (2) Spare space, request flags and information flags are provided for
     future expansion.

 (3) Better support for the y2038 problem [Arnd Bergmann] (tv_sec is an
     __s64).

 (4) Creation time: The SMB protocol carries the creation time, which could
     be exported by Samba, which will in turn help CIFS make use of
     FS-Cache as that can be used for coherency data (stx_btime).

     This is also specified in NFSv4 as a recommended attribute and could
     be exported by NFSD [Steve French].

 (5) Lightweight stat: Ask for just those details of interest, and allow a
     netfs (such as NFS) to approximate anything not of interest, possibly
     without going to the server [Trond Myklebust, Ulrich Drepper, Andreas
     Dilger] (AT_STATX_DONT_SYNC).

 (6) Heavyweight stat: Force a netfs to go to the server, even if it thinks
     its cached attributes are up to date [Trond Myklebust]
     (AT_STATX_FORCE_SYNC).

And the following have been left out for future extension:

 (7) Data version number: Could be used by userspace NFS servers [Aneesh
     Kumar].

     Can also be used to modify fill_post_wcc() in NFSD which retrieves
     i_version directly, but has just called vfs_getattr().  It could get
     it from the kstat struct if it used vfs_xgetattr() instead.

     (There's disagreement on the exact semantics of a single field, since
     not all filesystems do this the same way).

 (8) BSD stat compatibility: Including more fields from the BSD stat such
     as creation time (st_btime) and inode generation number (st_gen)
     [Jeremy Allison, Bernd Schubert].

 (9) Inode generation number: Useful for FUSE and userspace NFS servers
     [Bernd Schubert].

     (This was asked for but later deemed unnecessary with the
     open-by-handle capability available and caused disagreement as to
     whether it's a security hole or not).

(10) Extra coherency data may be useful in making backups [Andreas Dilger].

     (No particular data were offered, but things like last backup
     timestamp, the data version number and the DOS archive bit would come
     into this category).

(11) Allow the filesystem to indicate what it can/cannot provide: A
     filesystem can now say it doesn't support a standard stat feature if
     that isn't available, so if, for instance, inode numbers or UIDs don't
     exist or are fabricated locally...

     (This requires a separate system call - I have an fsinfo() call idea
     for this).

(12) Store a 16-byte volume ID in the superblock that can be returned in
     struct xstat [Steve French].

     (Deferred to fsinfo).

(13) Include granularity fields in the time data to indicate the
     granularity of each of the times (NFSv4 time_delta) [Steve French].

     (Deferred to fsinfo).

(14) FS_IOC_GETFLAGS value.  These could be translated to BSD's st_flags.
     Note that the Linux IOC flags are a mess and filesystems such as Ext4
     define flags that aren't in linux/fs.h, so translation in the kernel
     may be a necessity (or, possibly, we provide the filesystem type too).

     (Some attributes are made available in stx_attributes, but the general
     feeling was that the IOC flags were to ext[234]-specific and shouldn't
     be exposed through statx this way).

(15) Mask of features available on file (eg: ACLs, seclabel) [Brad Boyer,
     Michael Kerrisk].

     (Deferred, probably to fsinfo.  Finding out if there's an ACL or
     seclabal might require extra filesystem operations).

(16) Femtosecond-resolution timestamps [Dave Chinner].

     (A __reserved field has been left in the statx_timestamp struct for
     this - if there proves to be a need).

(17) A set multiple attributes syscall to go with this.

===============
NEW SYSTEM CALL
===============

The new system call is:

	int ret = statx(int dfd,
			const char *filename,
			unsigned int flags,
			unsigned int mask,
			struct statx *buffer);

The dfd, filename and flags parameters indicate the file to query, in a
similar way to fstatat().  There is no equivalent of lstat() as that can be
emulated with statx() by passing AT_SYMLINK_NOFOLLOW in flags.  There is
also no equivalent of fstat() as that can be emulated by passing a NULL
filename to statx() with the fd of interest in dfd.

Whether or not statx() synchronises the attributes with the backing store
can be controlled by OR'ing a value into the flags argument (this typically
only affects network filesystems):

 (1) AT_STATX_SYNC_AS_STAT tells statx() to behave as stat() does in this
     respect.

 (2) AT_STATX_FORCE_SYNC will require a network filesystem to synchronise
     its attributes with the server - which might require data writeback to
     occur to get the timestamps correct.

 (3) AT_STATX_DONT_SYNC will suppress synchronisation with the server in a
     network filesystem.  The resulting values should be considered
     approximate.

mask is a bitmask indicating the fields in struct statx that are of
interest to the caller.  The user should set this to STATX_BASIC_STATS to
get the basic set returned by stat().  It should be noted that asking for
more information may entail extra I/O operations.

buffer points to the destination for the data.  This must be 256 bytes in
size.

======================
MAIN ATTRIBUTES RECORD
======================

The following structures are defined in which to return the main attribute
set:

	struct statx_timestamp {
		__s64	tv_sec;
		__s32	tv_nsec;
		__s32	__reserved;
	};

	struct statx {
		__u32	stx_mask;
		__u32	stx_blksize;
		__u64	stx_attributes;
		__u32	stx_nlink;
		__u32	stx_uid;
		__u32	stx_gid;
		__u16	stx_mode;
		__u16	__spare0[1];
		__u64	stx_ino;
		__u64	stx_size;
		__u64	stx_blocks;
		__u64	__spare1[1];
		struct statx_timestamp	stx_atime;
		struct statx_timestamp	stx_btime;
		struct statx_timestamp	stx_ctime;
		struct statx_timestamp	stx_mtime;
		__u32	stx_rdev_major;
		__u32	stx_rdev_minor;
		__u32	stx_dev_major;
		__u32	stx_dev_minor;
		__u64	__spare2[14];
	};

The defined bits in request_mask and stx_mask are:

	STATX_TYPE		Want/got stx_mode & S_IFMT
	STATX_MODE		Want/got stx_mode & ~S_IFMT
	STATX_NLINK		Want/got stx_nlink
	STATX_UID		Want/got stx_uid
	STATX_GID		Want/got stx_gid
	STATX_ATIME		Want/got stx_atime{,_ns}
	STATX_MTIME		Want/got stx_mtime{,_ns}
	STATX_CTIME		Want/got stx_ctime{,_ns}
	STATX_INO		Want/got stx_ino
	STATX_SIZE		Want/got stx_size
	STATX_BLOCKS		Want/got stx_blocks
	STATX_BASIC_STATS	[The stuff in the normal stat struct]
	STATX_BTIME		Want/got stx_btime{,_ns}
	STATX_ALL		[All currently available stuff]

stx_btime is the file creation time, stx_mask is a bitmask indicating the
data provided and __spares*[] are where as-yet undefined fields can be
placed.

Time fields are structures with separate seconds and nanoseconds fields
plus a reserved field in case we want to add even finer resolution.  Note
that times will be negative if before 1970; in such a case, the nanosecond
fields will also be negative if not zero.

The bits defined in the stx_attributes field convey information about a
file, how it is accessed, where it is and what it does.  The following
attributes map to FS_*_FL flags and are the same numerical value:

	STATX_ATTR_COMPRESSED		File is compressed by the fs
	STATX_ATTR_IMMUTABLE		File is marked immutable
	STATX_ATTR_APPEND		File is append-only
	STATX_ATTR_NODUMP		File is not to be dumped
	STATX_ATTR_ENCRYPTED		File requires key to decrypt in fs

Within the kernel, the supported flags are listed by:

	KSTAT_ATTR_FS_IOC_FLAGS

[Are any other IOC flags of sufficient general interest to be exposed
through this interface?]

New flags include:

	STATX_ATTR_AUTOMOUNT		Object is an automount trigger

These are for the use of GUI tools that might want to mark files specially,
depending on what they are.

Fields in struct statx come in a number of classes:

 (0) stx_dev_*, stx_blksize.

     These are local system information and are always available.

 (1) stx_mode, stx_nlinks, stx_uid, stx_gid, stx_[amc]time, stx_ino,
     stx_size, stx_blocks.

     These will be returned whether the caller asks for them or not.  The
     corresponding bits in stx_mask will be set to indicate whether they
     actually have valid values.

     If the caller didn't ask for them, then they may be approximated.  For
     example, NFS won't waste any time updating them from the server,
     unless as a byproduct of updating something requested.

     If the values don't actually exist for the underlying object (such as
     UID or GID on a DOS file), then the bit won't be set in the stx_mask,
     even if the caller asked for the value.  In such a case, the returned
     value will be a fabrication.

     Note that there are instances where the type might not be valid, for
     instance Windows reparse points.

 (2) stx_rdev_*.

     This will be set only if stx_mode indicates we're looking at a
     blockdev or a chardev, otherwise will be 0.

 (3) stx_btime.

     Similar to (1), except this will be set to 0 if it doesn't exist.

=======
TESTING
=======

The following test program can be used to test the statx system call:

	samples/statx/test-statx.c

Just compile and run, passing it paths to the files you want to examine.
The file is built automatically if CONFIG_SAMPLES is enabled.

Here's some example output.  Firstly, an NFS directory that crosses to
another FSID.  Note that the AUTOMOUNT attribute is set because transiting
this directory will cause d_automount to be invoked by the VFS.

	[root@andromeda ~]# /tmp/test-statx -A /warthog/data
	statx(/warthog/data) = 0
	results=7ff
	  Size: 4096            Blocks: 8          IO Block: 1048576  directory
	Device: 00:26           Inode: 1703937     Links: 125
	Access: (3777/drwxrwxrwx)  Uid:     0   Gid:  4041
	Access: 2016-11-24 09:02:12.219699527+0000
	Modify: 2016-11-17 10:44:36.225653653+0000
	Change: 2016-11-17 10:44:36.225653653+0000
	Attributes: 0000000000001000 (-------- -------- -------- -------- -------- -------- ---m---- --------)

Secondly, the result of automounting on that directory.

	[root@andromeda ~]# /tmp/test-statx /warthog/data
	statx(/warthog/data) = 0
	results=7ff
	  Size: 4096            Blocks: 8          IO Block: 1048576  directory
	Device: 00:27           Inode: 2           Links: 125
	Access: (3777/drwxrwxrwx)  Uid:     0   Gid:  4041
	Access: 2016-11-24 09:02:12.219699527+0000
	Modify: 2016-11-17 10:44:36.225653653+0000
	Change: 2016-11-17 10:44:36.225653653+0000
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent bbe08c0a
...@@ -58,7 +58,8 @@ prototypes: ...@@ -58,7 +58,8 @@ prototypes:
int (*permission) (struct inode *, int, unsigned int); int (*permission) (struct inode *, int, unsigned int);
int (*get_acl)(struct inode *, int); int (*get_acl)(struct inode *, int);
int (*setattr) (struct dentry *, struct iattr *); int (*setattr) (struct dentry *, struct iattr *);
int (*getattr) (struct vfsmount *, struct dentry *, struct kstat *); int (*getattr) (const struct path *, struct dentry *, struct kstat *,
u32, unsigned int);
ssize_t (*listxattr) (struct dentry *, char *, size_t); ssize_t (*listxattr) (struct dentry *, char *, size_t);
int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, u64 len); int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, u64 len);
void (*update_time)(struct inode *, struct timespec *, int); void (*update_time)(struct inode *, struct timespec *, int);
......
...@@ -382,7 +382,8 @@ struct inode_operations { ...@@ -382,7 +382,8 @@ struct inode_operations {
int (*permission) (struct inode *, int); int (*permission) (struct inode *, int);
int (*get_acl)(struct inode *, int); int (*get_acl)(struct inode *, int);
int (*setattr) (struct dentry *, struct iattr *); int (*setattr) (struct dentry *, struct iattr *);
int (*getattr) (struct vfsmount *mnt, struct dentry *, struct kstat *); int (*getattr) (const struct path *, struct dentry *, struct kstat *,
u32, unsigned int);
ssize_t (*listxattr) (struct dentry *, char *, size_t); ssize_t (*listxattr) (struct dentry *, char *, size_t);
void (*update_time)(struct inode *, struct timespec *, int); void (*update_time)(struct inode *, struct timespec *, int);
int (*atomic_open)(struct inode *, struct dentry *, struct file *, int (*atomic_open)(struct inode *, struct dentry *, struct file *,
......
...@@ -389,3 +389,4 @@ ...@@ -389,3 +389,4 @@
380 i386 pkey_mprotect sys_pkey_mprotect 380 i386 pkey_mprotect sys_pkey_mprotect
381 i386 pkey_alloc sys_pkey_alloc 381 i386 pkey_alloc sys_pkey_alloc
382 i386 pkey_free sys_pkey_free 382 i386 pkey_free sys_pkey_free
383 i386 statx sys_statx
...@@ -338,6 +338,7 @@ ...@@ -338,6 +338,7 @@
329 common pkey_mprotect sys_pkey_mprotect 329 common pkey_mprotect sys_pkey_mprotect
330 common pkey_alloc sys_pkey_alloc 330 common pkey_alloc sys_pkey_alloc
331 common pkey_free sys_pkey_free 331 common pkey_free sys_pkey_free
332 common statx sys_statx
# #
# x32-specific system call numbers start at 512 to avoid cache impact # x32-specific system call numbers start at 512 to avoid cache impact
......
...@@ -309,7 +309,8 @@ static int handle_remove(const char *nodename, struct device *dev) ...@@ -309,7 +309,8 @@ static int handle_remove(const char *nodename, struct device *dev)
if (d_really_is_positive(dentry)) { if (d_really_is_positive(dentry)) {
struct kstat stat; struct kstat stat;
struct path p = {.mnt = parent.mnt, .dentry = dentry}; struct path p = {.mnt = parent.mnt, .dentry = dentry};
err = vfs_getattr(&p, &stat); err = vfs_getattr(&p, &stat, STATX_TYPE | STATX_MODE,
AT_STATX_SYNC_AS_STAT);
if (!err && dev_mynode(dev, d_inode(dentry), &stat)) { if (!err && dev_mynode(dev, d_inode(dentry), &stat)) {
struct iattr newattrs; struct iattr newattrs;
/* /*
......
...@@ -1175,7 +1175,8 @@ loop_get_status(struct loop_device *lo, struct loop_info64 *info) ...@@ -1175,7 +1175,8 @@ loop_get_status(struct loop_device *lo, struct loop_info64 *info)
if (lo->lo_state != Lo_bound) if (lo->lo_state != Lo_bound)
return -ENXIO; return -ENXIO;
error = vfs_getattr(&file->f_path, &stat); error = vfs_getattr(&file->f_path, &stat,
STATX_INO, AT_STATX_SYNC_AS_STAT);
if (error) if (error)
return error; return error;
memset(info, 0, sizeof(*info)); memset(info, 0, sizeof(*info));
......
...@@ -1159,7 +1159,7 @@ static struct mtd_info * __init open_mtd_by_chdev(const char *mtd_dev) ...@@ -1159,7 +1159,7 @@ static struct mtd_info * __init open_mtd_by_chdev(const char *mtd_dev)
if (err) if (err)
return ERR_PTR(err); return ERR_PTR(err);
err = vfs_getattr(&path, &stat); err = vfs_getattr(&path, &stat, STATX_TYPE, AT_STATX_SYNC_AS_STAT);
path_put(&path); path_put(&path);
if (err) if (err)
return ERR_PTR(err); return ERR_PTR(err);
......
...@@ -314,7 +314,7 @@ struct ubi_volume_desc *ubi_open_volume_path(const char *pathname, int mode) ...@@ -314,7 +314,7 @@ struct ubi_volume_desc *ubi_open_volume_path(const char *pathname, int mode)
if (error) if (error)
return ERR_PTR(error); return ERR_PTR(error);
error = vfs_getattr(&path, &stat); error = vfs_getattr(&path, &stat, STATX_TYPE, AT_STATX_SYNC_AS_STAT);
path_put(&path); path_put(&path);
if (error) if (error)
return ERR_PTR(error); return ERR_PTR(error);
......
...@@ -2952,15 +2952,16 @@ static int ll_inode_revalidate(struct dentry *dentry, __u64 ibits) ...@@ -2952,15 +2952,16 @@ static int ll_inode_revalidate(struct dentry *dentry, __u64 ibits)
return rc; return rc;
} }
int ll_getattr(struct vfsmount *mnt, struct dentry *de, struct kstat *stat) int ll_getattr(const struct path *path, struct kstat *stat,
u32 request_mask, unsigned int flags)
{ {
struct inode *inode = d_inode(de); struct inode *inode = d_inode(path->dentry);
struct ll_sb_info *sbi = ll_i2sbi(inode); struct ll_sb_info *sbi = ll_i2sbi(inode);
struct ll_inode_info *lli = ll_i2info(inode); struct ll_inode_info *lli = ll_i2info(inode);
int res; int res;
res = ll_inode_revalidate(de, MDS_INODELOCK_UPDATE | res = ll_inode_revalidate(path->dentry,
MDS_INODELOCK_LOOKUP); MDS_INODELOCK_UPDATE | MDS_INODELOCK_LOOKUP);
ll_stats_ops_tally(sbi, LPROC_LL_GETATTR, 1); ll_stats_ops_tally(sbi, LPROC_LL_GETATTR, 1);
if (res) if (res)
......
...@@ -750,7 +750,8 @@ int ll_file_open(struct inode *inode, struct file *file); ...@@ -750,7 +750,8 @@ int ll_file_open(struct inode *inode, struct file *file);
int ll_file_release(struct inode *inode, struct file *file); int ll_file_release(struct inode *inode, struct file *file);
int ll_release_openhandle(struct inode *, struct lookup_intent *); int ll_release_openhandle(struct inode *, struct lookup_intent *);
int ll_md_real_close(struct inode *inode, fmode_t fmode); int ll_md_real_close(struct inode *inode, fmode_t fmode);
int ll_getattr(struct vfsmount *mnt, struct dentry *de, struct kstat *stat); int ll_getattr(const struct path *path, struct kstat *stat,
u32 request_mask, unsigned int flags);
struct posix_acl *ll_get_acl(struct inode *inode, int type); struct posix_acl *ll_get_acl(struct inode *inode, int type);
int ll_migrate(struct inode *parent, struct file *file, int mdtidx, int ll_migrate(struct inode *parent, struct file *file, int mdtidx,
const char *name, int namelen); const char *name, int namelen);
......
...@@ -1047,16 +1047,18 @@ v9fs_vfs_rename(struct inode *old_dir, struct dentry *old_dentry, ...@@ -1047,16 +1047,18 @@ v9fs_vfs_rename(struct inode *old_dir, struct dentry *old_dentry,
/** /**
* v9fs_vfs_getattr - retrieve file metadata * v9fs_vfs_getattr - retrieve file metadata
* @mnt: mount information * @path: Object to query
* @dentry: file to get attributes on
* @stat: metadata structure to populate * @stat: metadata structure to populate
* @request_mask: Mask of STATX_xxx flags indicating the caller's interests
* @flags: AT_STATX_xxx setting
* *
*/ */
static int static int
v9fs_vfs_getattr(struct vfsmount *mnt, struct dentry *dentry, v9fs_vfs_getattr(const struct path *path, struct kstat *stat,
struct kstat *stat) u32 request_mask, unsigned int flags)
{ {
struct dentry *dentry = path->dentry;
struct v9fs_session_info *v9ses; struct v9fs_session_info *v9ses;
struct p9_fid *fid; struct p9_fid *fid;
struct p9_wstat *st; struct p9_wstat *st;
......
...@@ -468,9 +468,10 @@ static int v9fs_vfs_mkdir_dotl(struct inode *dir, ...@@ -468,9 +468,10 @@ static int v9fs_vfs_mkdir_dotl(struct inode *dir,
} }
static int static int
v9fs_vfs_getattr_dotl(struct vfsmount *mnt, struct dentry *dentry, v9fs_vfs_getattr_dotl(const struct path *path, struct kstat *stat,
struct kstat *stat) u32 request_mask, unsigned int flags)
{ {
struct dentry *dentry = path->dentry;
struct v9fs_session_info *v9ses; struct v9fs_session_info *v9ses;
struct p9_fid *fid; struct p9_fid *fid;
struct p9_stat_dotl *st; struct p9_stat_dotl *st;
......
...@@ -375,12 +375,10 @@ int afs_validate(struct afs_vnode *vnode, struct key *key) ...@@ -375,12 +375,10 @@ int afs_validate(struct afs_vnode *vnode, struct key *key)
/* /*
* read the attributes of an inode * read the attributes of an inode
*/ */
int afs_getattr(struct vfsmount *mnt, struct dentry *dentry, int afs_getattr(const struct path *path, struct kstat *stat,
struct kstat *stat) u32 request_mask, unsigned int query_flags)
{ {
struct inode *inode; struct inode *inode = d_inode(path->dentry);
inode = d_inode(dentry);
_enter("{ ino=%lu v=%u }", inode->i_ino, inode->i_generation); _enter("{ ino=%lu v=%u }", inode->i_ino, inode->i_generation);
......
...@@ -533,7 +533,7 @@ extern struct inode *afs_iget(struct super_block *, struct key *, ...@@ -533,7 +533,7 @@ extern struct inode *afs_iget(struct super_block *, struct key *,
struct afs_callback *); struct afs_callback *);
extern void afs_zap_data(struct afs_vnode *); extern void afs_zap_data(struct afs_vnode *);
extern int afs_validate(struct afs_vnode *, struct key *); extern int afs_validate(struct afs_vnode *, struct key *);
extern int afs_getattr(struct vfsmount *, struct dentry *, struct kstat *); extern int afs_getattr(const struct path *, struct kstat *, u32, unsigned int);
extern int afs_setattr(struct dentry *, struct iattr *); extern int afs_setattr(struct dentry *, struct iattr *);
extern void afs_evict_inode(struct inode *); extern void afs_evict_inode(struct inode *);
extern int afs_drop_inode(struct inode *); extern int afs_drop_inode(struct inode *);
......
...@@ -89,8 +89,8 @@ static int bad_inode_permission(struct inode *inode, int mask) ...@@ -89,8 +89,8 @@ static int bad_inode_permission(struct inode *inode, int mask)
return -EIO; return -EIO;
} }
static int bad_inode_getattr(struct vfsmount *mnt, struct dentry *dentry, static int bad_inode_getattr(const struct path *path, struct kstat *stat,
struct kstat *stat) u32 request_mask, unsigned int query_flags)
{ {
return -EIO; return -EIO;
} }
......
...@@ -9413,11 +9413,11 @@ int btrfs_init_cachep(void) ...@@ -9413,11 +9413,11 @@ int btrfs_init_cachep(void)
return -ENOMEM; return -ENOMEM;
} }
static int btrfs_getattr(struct vfsmount *mnt, static int btrfs_getattr(const struct path *path, struct kstat *stat,
struct dentry *dentry, struct kstat *stat) u32 request_mask, unsigned int flags)
{ {
u64 delalloc_bytes; u64 delalloc_bytes;
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(path->dentry);
u32 blocksize = inode->i_sb->s_blocksize; u32 blocksize = inode->i_sb->s_blocksize;
generic_fillattr(inode, stat); generic_fillattr(inode, stat);
......
...@@ -2187,10 +2187,10 @@ int ceph_permission(struct inode *inode, int mask) ...@@ -2187,10 +2187,10 @@ int ceph_permission(struct inode *inode, int mask)
* Get all attributes. Hopefully somedata we'll have a statlite() * Get all attributes. Hopefully somedata we'll have a statlite()
* and can limit the fields we require to be accurate. * and can limit the fields we require to be accurate.
*/ */
int ceph_getattr(struct vfsmount *mnt, struct dentry *dentry, int ceph_getattr(const struct path *path, struct kstat *stat,
struct kstat *stat) u32 request_mask, unsigned int flags)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(path->dentry);
struct ceph_inode_info *ci = ceph_inode(inode); struct ceph_inode_info *ci = ceph_inode(inode);
int err; int err;
......
...@@ -784,8 +784,8 @@ static inline int ceph_do_getattr(struct inode *inode, int mask, bool force) ...@@ -784,8 +784,8 @@ static inline int ceph_do_getattr(struct inode *inode, int mask, bool force)
extern int ceph_permission(struct inode *inode, int mask); extern int ceph_permission(struct inode *inode, int mask);
extern int __ceph_setattr(struct inode *inode, struct iattr *attr); extern int __ceph_setattr(struct inode *inode, struct iattr *attr);
extern int ceph_setattr(struct dentry *dentry, struct iattr *attr); extern int ceph_setattr(struct dentry *dentry, struct iattr *attr);
extern int ceph_getattr(struct vfsmount *mnt, struct dentry *dentry, extern int ceph_getattr(const struct path *path, struct kstat *stat,
struct kstat *stat); u32 request_mask, unsigned int flags);
/* xattr.c */ /* xattr.c */
int __ceph_setxattr(struct inode *, const char *, const void *, size_t, int); int __ceph_setxattr(struct inode *, const char *, const void *, size_t, int);
......
...@@ -83,7 +83,7 @@ extern int cifs_revalidate_dentry(struct dentry *); ...@@ -83,7 +83,7 @@ extern int cifs_revalidate_dentry(struct dentry *);
extern int cifs_invalidate_mapping(struct inode *inode); extern int cifs_invalidate_mapping(struct inode *inode);
extern int cifs_revalidate_mapping(struct inode *inode); extern int cifs_revalidate_mapping(struct inode *inode);
extern int cifs_zap_mapping(struct inode *inode); extern int cifs_zap_mapping(struct inode *inode);
extern int cifs_getattr(struct vfsmount *, struct dentry *, struct kstat *); extern int cifs_getattr(const struct path *, struct kstat *, u32, unsigned int);
extern int cifs_setattr(struct dentry *, struct iattr *); extern int cifs_setattr(struct dentry *, struct iattr *);
extern const struct inode_operations cifs_file_inode_ops; extern const struct inode_operations cifs_file_inode_ops;
......
...@@ -1990,9 +1990,10 @@ int cifs_revalidate_dentry(struct dentry *dentry) ...@@ -1990,9 +1990,10 @@ int cifs_revalidate_dentry(struct dentry *dentry)
return cifs_revalidate_mapping(inode); return cifs_revalidate_mapping(inode);
} }
int cifs_getattr(struct vfsmount *mnt, struct dentry *dentry, int cifs_getattr(const struct path *path, struct kstat *stat,
struct kstat *stat) u32 request_mask, unsigned int flags)
{ {
struct dentry *dentry = path->dentry;
struct cifs_sb_info *cifs_sb = CIFS_SB(dentry->d_sb); struct cifs_sb_info *cifs_sb = CIFS_SB(dentry->d_sb);
struct cifs_tcon *tcon = cifs_sb_master_tcon(cifs_sb); struct cifs_tcon *tcon = cifs_sb_master_tcon(cifs_sb);
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
......
...@@ -47,7 +47,7 @@ int coda_open(struct inode *i, struct file *f); ...@@ -47,7 +47,7 @@ int coda_open(struct inode *i, struct file *f);
int coda_release(struct inode *i, struct file *f); int coda_release(struct inode *i, struct file *f);
int coda_permission(struct inode *inode, int mask); int coda_permission(struct inode *inode, int mask);
int coda_revalidate_inode(struct inode *); int coda_revalidate_inode(struct inode *);
int coda_getattr(struct vfsmount *, struct dentry *, struct kstat *); int coda_getattr(const struct path *, struct kstat *, u32, unsigned int);
int coda_setattr(struct dentry *, struct iattr *); int coda_setattr(struct dentry *, struct iattr *);
/* this file: heloers */ /* this file: heloers */
......
...@@ -255,11 +255,12 @@ static void coda_evict_inode(struct inode *inode) ...@@ -255,11 +255,12 @@ static void coda_evict_inode(struct inode *inode)
coda_cache_clear_inode(inode); coda_cache_clear_inode(inode);
} }
int coda_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat) int coda_getattr(const struct path *path, struct kstat *stat,
u32 request_mask, unsigned int flags)
{ {
int err = coda_revalidate_inode(d_inode(dentry)); int err = coda_revalidate_inode(d_inode(path->dentry));
if (!err) if (!err)
generic_fillattr(d_inode(dentry), stat); generic_fillattr(d_inode(path->dentry), stat);
return err; return err;
} }
......
...@@ -959,9 +959,10 @@ static int ecryptfs_setattr(struct dentry *dentry, struct iattr *ia) ...@@ -959,9 +959,10 @@ static int ecryptfs_setattr(struct dentry *dentry, struct iattr *ia)
return rc; return rc;
} }
static int ecryptfs_getattr_link(struct vfsmount *mnt, struct dentry *dentry, static int ecryptfs_getattr_link(const struct path *path, struct kstat *stat,
struct kstat *stat) u32 request_mask, unsigned int flags)
{ {
struct dentry *dentry = path->dentry;
struct ecryptfs_mount_crypt_stat *mount_crypt_stat; struct ecryptfs_mount_crypt_stat *mount_crypt_stat;
int rc = 0; int rc = 0;
...@@ -983,13 +984,15 @@ static int ecryptfs_getattr_link(struct vfsmount *mnt, struct dentry *dentry, ...@@ -983,13 +984,15 @@ static int ecryptfs_getattr_link(struct vfsmount *mnt, struct dentry *dentry,
return rc; return rc;
} }
static int ecryptfs_getattr(struct vfsmount *mnt, struct dentry *dentry, static int ecryptfs_getattr(const struct path *path, struct kstat *stat,
struct kstat *stat) u32 request_mask, unsigned int flags)
{ {
struct dentry *dentry = path->dentry;
struct kstat lower_stat; struct kstat lower_stat;
int rc; int rc;
rc = vfs_getattr(ecryptfs_dentry_to_lower_path(dentry), &lower_stat); rc = vfs_getattr(ecryptfs_dentry_to_lower_path(dentry), &lower_stat,
request_mask, flags);
if (!rc) { if (!rc) {
fsstack_copy_attr_all(d_inode(dentry), fsstack_copy_attr_all(d_inode(dentry),
ecryptfs_inode_to_lower(d_inode(dentry))); ecryptfs_inode_to_lower(d_inode(dentry)));
......
...@@ -299,7 +299,8 @@ static int get_name(const struct path *path, char *name, struct dentry *child) ...@@ -299,7 +299,8 @@ static int get_name(const struct path *path, char *name, struct dentry *child)
* filesystem supports 64-bit inode numbers. So we need to * filesystem supports 64-bit inode numbers. So we need to
* actually call ->getattr, not just read i_ino: * actually call ->getattr, not just read i_ino:
*/ */
error = vfs_getattr_nosec(&child_path, &stat); error = vfs_getattr_nosec(&child_path, &stat,
STATX_INO, AT_STATX_SYNC_AS_STAT);
if (error) if (error)
return error; return error;
buffer.ino = stat.ino; buffer.ino = stat.ino;
......
...@@ -2462,8 +2462,7 @@ extern struct inode *ext4_iget(struct super_block *, unsigned long); ...@@ -2462,8 +2462,7 @@ extern struct inode *ext4_iget(struct super_block *, unsigned long);
extern struct inode *ext4_iget_normal(struct super_block *, unsigned long); extern struct inode *ext4_iget_normal(struct super_block *, unsigned long);
extern int ext4_write_inode(struct inode *, struct writeback_control *); extern int ext4_write_inode(struct inode *, struct writeback_control *);
extern int ext4_setattr(struct dentry *, struct iattr *); extern int ext4_setattr(struct dentry *, struct iattr *);
extern int ext4_getattr(struct vfsmount *mnt, struct dentry *dentry, extern int ext4_getattr(const struct path *, struct kstat *, u32, unsigned int);
struct kstat *stat);
extern void ext4_evict_inode(struct inode *); extern void ext4_evict_inode(struct inode *);
extern void ext4_clear_inode(struct inode *); extern void ext4_clear_inode(struct inode *);
extern int ext4_sync_inode(handle_t *, struct inode *); extern int ext4_sync_inode(handle_t *, struct inode *);
......
...@@ -5387,13 +5387,13 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr) ...@@ -5387,13 +5387,13 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr)
return error; return error;
} }
int ext4_getattr(struct vfsmount *mnt, struct dentry *dentry, int ext4_getattr(const struct path *path, struct kstat *stat,
struct kstat *stat) u32 request_mask, unsigned int query_flags)
{ {
struct inode *inode; struct inode *inode;
unsigned long long delalloc_blocks; unsigned long long delalloc_blocks;
inode = d_inode(dentry); inode = d_inode(path->dentry);
generic_fillattr(inode, stat); generic_fillattr(inode, stat);
/* /*
......
...@@ -2040,8 +2040,8 @@ int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync); ...@@ -2040,8 +2040,8 @@ int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync);
void truncate_data_blocks(struct dnode_of_data *dn); void truncate_data_blocks(struct dnode_of_data *dn);
int truncate_blocks(struct inode *inode, u64 from, bool lock); int truncate_blocks(struct inode *inode, u64 from, bool lock);
int f2fs_truncate(struct inode *inode); int f2fs_truncate(struct inode *inode);
int f2fs_getattr(struct vfsmount *mnt, struct dentry *dentry, int f2fs_getattr(const struct path *path, struct kstat *stat,
struct kstat *stat); u32 request_mask, unsigned int flags);
int f2fs_setattr(struct dentry *dentry, struct iattr *attr); int f2fs_setattr(struct dentry *dentry, struct iattr *attr);
int truncate_hole(struct inode *inode, pgoff_t pg_start, pgoff_t pg_end); int truncate_hole(struct inode *inode, pgoff_t pg_start, pgoff_t pg_end);
int truncate_data_blocks_range(struct dnode_of_data *dn, int count); int truncate_data_blocks_range(struct dnode_of_data *dn, int count);
......
...@@ -633,10 +633,10 @@ int f2fs_truncate(struct inode *inode) ...@@ -633,10 +633,10 @@ int f2fs_truncate(struct inode *inode)
return 0; return 0;
} }
int f2fs_getattr(struct vfsmount *mnt, int f2fs_getattr(const struct path *path, struct kstat *stat,
struct dentry *dentry, struct kstat *stat) u32 request_mask, unsigned int flags)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(path->dentry);
generic_fillattr(inode, stat); generic_fillattr(inode, stat);
stat->blocks <<= 3; stat->blocks <<= 3;
return 0; return 0;
......
...@@ -364,8 +364,8 @@ extern const struct file_operations fat_file_operations; ...@@ -364,8 +364,8 @@ extern const struct file_operations fat_file_operations;
extern const struct inode_operations fat_file_inode_operations; extern const struct inode_operations fat_file_inode_operations;
extern int fat_setattr(struct dentry *dentry, struct iattr *attr); extern int fat_setattr(struct dentry *dentry, struct iattr *attr);
extern void fat_truncate_blocks(struct inode *inode, loff_t offset); extern void fat_truncate_blocks(struct inode *inode, loff_t offset);
extern int fat_getattr(struct vfsmount *mnt, struct dentry *dentry, extern int fat_getattr(const struct path *path, struct kstat *stat,
struct kstat *stat); u32 request_mask, unsigned int flags);
extern int fat_file_fsync(struct file *file, loff_t start, loff_t end, extern int fat_file_fsync(struct file *file, loff_t start, loff_t end,
int datasync); int datasync);
......
...@@ -365,9 +365,10 @@ void fat_truncate_blocks(struct inode *inode, loff_t offset) ...@@ -365,9 +365,10 @@ void fat_truncate_blocks(struct inode *inode, loff_t offset)
fat_flush_inodes(inode->i_sb, inode, NULL); fat_flush_inodes(inode->i_sb, inode, NULL);
} }
int fat_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat) int fat_getattr(const struct path *path, struct kstat *stat,
u32 request_mask, unsigned int flags)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(path->dentry);
generic_fillattr(inode, stat); generic_fillattr(inode, stat);
stat->blksize = MSDOS_SB(inode->i_sb)->cluster_size; stat->blksize = MSDOS_SB(inode->i_sb)->cluster_size;
......
...@@ -1777,10 +1777,10 @@ static int fuse_setattr(struct dentry *entry, struct iattr *attr) ...@@ -1777,10 +1777,10 @@ static int fuse_setattr(struct dentry *entry, struct iattr *attr)
return ret; return ret;
} }
static int fuse_getattr(struct vfsmount *mnt, struct dentry *entry, static int fuse_getattr(const struct path *path, struct kstat *stat,
struct kstat *stat) u32 request_mask, unsigned int flags)
{ {
struct inode *inode = d_inode(entry); struct inode *inode = d_inode(path->dentry);
struct fuse_conn *fc = get_fuse_conn(inode); struct fuse_conn *fc = get_fuse_conn(inode);
if (!fuse_allow_current_process(fc)) if (!fuse_allow_current_process(fc))
......
...@@ -1959,9 +1959,10 @@ static int gfs2_setattr(struct dentry *dentry, struct iattr *attr) ...@@ -1959,9 +1959,10 @@ static int gfs2_setattr(struct dentry *dentry, struct iattr *attr)
/** /**
* gfs2_getattr - Read out an inode's attributes * gfs2_getattr - Read out an inode's attributes
* @mnt: The vfsmount the inode is being accessed from * @path: Object to query
* @dentry: The dentry to stat
* @stat: The inode's stats * @stat: The inode's stats
* @request_mask: Mask of STATX_xxx flags indicating the caller's interests
* @flags: AT_STATX_xxx setting
* *
* This may be called from the VFS directly, or from within GFS2 with the * This may be called from the VFS directly, or from within GFS2 with the
* inode locked, so we look to see if the glock is already locked and only * inode locked, so we look to see if the glock is already locked and only
...@@ -1972,10 +1973,10 @@ static int gfs2_setattr(struct dentry *dentry, struct iattr *attr) ...@@ -1972,10 +1973,10 @@ static int gfs2_setattr(struct dentry *dentry, struct iattr *attr)
* Returns: errno * Returns: errno
*/ */
static int gfs2_getattr(struct vfsmount *mnt, struct dentry *dentry, static int gfs2_getattr(const struct path *path, struct kstat *stat,
struct kstat *stat) u32 request_mask, unsigned int flags)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(path->dentry);
struct gfs2_inode *ip = GFS2_I(inode); struct gfs2_inode *ip = GFS2_I(inode);
struct gfs2_holder gh; struct gfs2_holder gh;
int error; int error;
......
...@@ -200,11 +200,11 @@ static void kernfs_refresh_inode(struct kernfs_node *kn, struct inode *inode) ...@@ -200,11 +200,11 @@ static void kernfs_refresh_inode(struct kernfs_node *kn, struct inode *inode)
set_nlink(inode, kn->dir.subdirs + 2); set_nlink(inode, kn->dir.subdirs + 2);
} }
int kernfs_iop_getattr(struct vfsmount *mnt, struct dentry *dentry, int kernfs_iop_getattr(const struct path *path, struct kstat *stat,
struct kstat *stat) u32 request_mask, unsigned int query_flags)
{ {
struct kernfs_node *kn = dentry->d_fsdata; struct kernfs_node *kn = path->dentry->d_fsdata;
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(path->dentry);
mutex_lock(&kernfs_mutex); mutex_lock(&kernfs_mutex);
kernfs_refresh_inode(kn, inode); kernfs_refresh_inode(kn, inode);
......
...@@ -80,8 +80,8 @@ extern const struct xattr_handler *kernfs_xattr_handlers[]; ...@@ -80,8 +80,8 @@ extern const struct xattr_handler *kernfs_xattr_handlers[];
void kernfs_evict_inode(struct inode *inode); void kernfs_evict_inode(struct inode *inode);
int kernfs_iop_permission(struct inode *inode, int mask); int kernfs_iop_permission(struct inode *inode, int mask);
int kernfs_iop_setattr(struct dentry *dentry, struct iattr *iattr); int kernfs_iop_setattr(struct dentry *dentry, struct iattr *iattr);
int kernfs_iop_getattr(struct vfsmount *mnt, struct dentry *dentry, int kernfs_iop_getattr(const struct path *path, struct kstat *stat,
struct kstat *stat); u32 request_mask, unsigned int query_flags);
ssize_t kernfs_iop_listxattr(struct dentry *dentry, char *buf, size_t size); ssize_t kernfs_iop_listxattr(struct dentry *dentry, char *buf, size_t size);
/* /*
......
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
#include "internal.h"