Skip to content

Commit a528d35

Browse files
dhowellsAl Viro
authored and
Al Viro
committed
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: David Howells <[email protected]> Signed-off-by: Al Viro <[email protected]>
1 parent bbe08c0 commit a528d35

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+822
-214
lines changed

Documentation/filesystems/Locking

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ prototypes:
5858
int (*permission) (struct inode *, int, unsigned int);
5959
int (*get_acl)(struct inode *, int);
6060
int (*setattr) (struct dentry *, struct iattr *);
61-
int (*getattr) (struct vfsmount *, struct dentry *, struct kstat *);
61+
int (*getattr) (const struct path *, struct dentry *, struct kstat *,
62+
u32, unsigned int);
6263
ssize_t (*listxattr) (struct dentry *, char *, size_t);
6364
int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, u64 len);
6465
void (*update_time)(struct inode *, struct timespec *, int);

Documentation/filesystems/vfs.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,8 @@ struct inode_operations {
382382
int (*permission) (struct inode *, int);
383383
int (*get_acl)(struct inode *, int);
384384
int (*setattr) (struct dentry *, struct iattr *);
385-
int (*getattr) (struct vfsmount *mnt, struct dentry *, struct kstat *);
385+
int (*getattr) (const struct path *, struct dentry *, struct kstat *,
386+
u32, unsigned int);
386387
ssize_t (*listxattr) (struct dentry *, char *, size_t);
387388
void (*update_time)(struct inode *, struct timespec *, int);
388389
int (*atomic_open)(struct inode *, struct dentry *, struct file *,

arch/x86/entry/syscalls/syscall_32.tbl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,3 +389,4 @@
389389
380 i386 pkey_mprotect sys_pkey_mprotect
390390
381 i386 pkey_alloc sys_pkey_alloc
391391
382 i386 pkey_free sys_pkey_free
392+
383 i386 statx sys_statx

arch/x86/entry/syscalls/syscall_64.tbl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,7 @@
338338
329 common pkey_mprotect sys_pkey_mprotect
339339
330 common pkey_alloc sys_pkey_alloc
340340
331 common pkey_free sys_pkey_free
341+
332 common statx sys_statx
341342

342343
#
343344
# x32-specific system call numbers start at 512 to avoid cache impact

drivers/base/devtmpfs.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,8 @@ static int handle_remove(const char *nodename, struct device *dev)
309309
if (d_really_is_positive(dentry)) {
310310
struct kstat stat;
311311
struct path p = {.mnt = parent.mnt, .dentry = dentry};
312-
err = vfs_getattr(&p, &stat);
312+
err = vfs_getattr(&p, &stat, STATX_TYPE | STATX_MODE,
313+
AT_STATX_SYNC_AS_STAT);
313314
if (!err && dev_mynode(dev, d_inode(dentry), &stat)) {
314315
struct iattr newattrs;
315316
/*

drivers/block/loop.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1175,7 +1175,8 @@ loop_get_status(struct loop_device *lo, struct loop_info64 *info)
11751175

11761176
if (lo->lo_state != Lo_bound)
11771177
return -ENXIO;
1178-
error = vfs_getattr(&file->f_path, &stat);
1178+
error = vfs_getattr(&file->f_path, &stat,
1179+
STATX_INO, AT_STATX_SYNC_AS_STAT);
11791180
if (error)
11801181
return error;
11811182
memset(info, 0, sizeof(*info));

drivers/mtd/ubi/build.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1159,7 +1159,7 @@ static struct mtd_info * __init open_mtd_by_chdev(const char *mtd_dev)
11591159
if (err)
11601160
return ERR_PTR(err);
11611161

1162-
err = vfs_getattr(&path, &stat);
1162+
err = vfs_getattr(&path, &stat, STATX_TYPE, AT_STATX_SYNC_AS_STAT);
11631163
path_put(&path);
11641164
if (err)
11651165
return ERR_PTR(err);

drivers/mtd/ubi/kapi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ struct ubi_volume_desc *ubi_open_volume_path(const char *pathname, int mode)
314314
if (error)
315315
return ERR_PTR(error);
316316

317-
error = vfs_getattr(&path, &stat);
317+
error = vfs_getattr(&path, &stat, STATX_TYPE, AT_STATX_SYNC_AS_STAT);
318318
path_put(&path);
319319
if (error)
320320
return ERR_PTR(error);

drivers/staging/lustre/lustre/llite/file.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2952,15 +2952,16 @@ static int ll_inode_revalidate(struct dentry *dentry, __u64 ibits)
29522952
return rc;
29532953
}
29542954

2955-
int ll_getattr(struct vfsmount *mnt, struct dentry *de, struct kstat *stat)
2955+
int ll_getattr(const struct path *path, struct kstat *stat,
2956+
u32 request_mask, unsigned int flags)
29562957
{
2957-
struct inode *inode = d_inode(de);
2958+
struct inode *inode = d_inode(path->dentry);
29582959
struct ll_sb_info *sbi = ll_i2sbi(inode);
29592960
struct ll_inode_info *lli = ll_i2info(inode);
29602961
int res;
29612962

2962-
res = ll_inode_revalidate(de, MDS_INODELOCK_UPDATE |
2963-
MDS_INODELOCK_LOOKUP);
2963+
res = ll_inode_revalidate(path->dentry,
2964+
MDS_INODELOCK_UPDATE | MDS_INODELOCK_LOOKUP);
29642965
ll_stats_ops_tally(sbi, LPROC_LL_GETATTR, 1);
29652966

29662967
if (res)

drivers/staging/lustre/lustre/llite/llite_internal.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,8 @@ int ll_file_open(struct inode *inode, struct file *file);
750750
int ll_file_release(struct inode *inode, struct file *file);
751751
int ll_release_openhandle(struct inode *, struct lookup_intent *);
752752
int ll_md_real_close(struct inode *inode, fmode_t fmode);
753-
int ll_getattr(struct vfsmount *mnt, struct dentry *de, struct kstat *stat);
753+
int ll_getattr(const struct path *path, struct kstat *stat,
754+
u32 request_mask, unsigned int flags);
754755
struct posix_acl *ll_get_acl(struct inode *inode, int type);
755756
int ll_migrate(struct inode *parent, struct file *file, int mdtidx,
756757
const char *name, int namelen);

fs/9p/vfs_inode.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,16 +1047,18 @@ v9fs_vfs_rename(struct inode *old_dir, struct dentry *old_dentry,
10471047

10481048
/**
10491049
* v9fs_vfs_getattr - retrieve file metadata
1050-
* @mnt: mount information
1051-
* @dentry: file to get attributes on
1050+
* @path: Object to query
10521051
* @stat: metadata structure to populate
1052+
* @request_mask: Mask of STATX_xxx flags indicating the caller's interests
1053+
* @flags: AT_STATX_xxx setting
10531054
*
10541055
*/
10551056

10561057
static int
1057-
v9fs_vfs_getattr(struct vfsmount *mnt, struct dentry *dentry,
1058-
struct kstat *stat)
1058+
v9fs_vfs_getattr(const struct path *path, struct kstat *stat,
1059+
u32 request_mask, unsigned int flags)
10591060
{
1061+
struct dentry *dentry = path->dentry;
10601062
struct v9fs_session_info *v9ses;
10611063
struct p9_fid *fid;
10621064
struct p9_wstat *st;

fs/9p/vfs_inode_dotl.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -468,9 +468,10 @@ static int v9fs_vfs_mkdir_dotl(struct inode *dir,
468468
}
469469

470470
static int
471-
v9fs_vfs_getattr_dotl(struct vfsmount *mnt, struct dentry *dentry,
472-
struct kstat *stat)
471+
v9fs_vfs_getattr_dotl(const struct path *path, struct kstat *stat,
472+
u32 request_mask, unsigned int flags)
473473
{
474+
struct dentry *dentry = path->dentry;
474475
struct v9fs_session_info *v9ses;
475476
struct p9_fid *fid;
476477
struct p9_stat_dotl *st;

fs/afs/inode.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -375,12 +375,10 @@ int afs_validate(struct afs_vnode *vnode, struct key *key)
375375
/*
376376
* read the attributes of an inode
377377
*/
378-
int afs_getattr(struct vfsmount *mnt, struct dentry *dentry,
379-
struct kstat *stat)
378+
int afs_getattr(const struct path *path, struct kstat *stat,
379+
u32 request_mask, unsigned int query_flags)
380380
{
381-
struct inode *inode;
382-
383-
inode = d_inode(dentry);
381+
struct inode *inode = d_inode(path->dentry);
384382

385383
_enter("{ ino=%lu v=%u }", inode->i_ino, inode->i_generation);
386384

fs/afs/internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ extern struct inode *afs_iget(struct super_block *, struct key *,
533533
struct afs_callback *);
534534
extern void afs_zap_data(struct afs_vnode *);
535535
extern int afs_validate(struct afs_vnode *, struct key *);
536-
extern int afs_getattr(struct vfsmount *, struct dentry *, struct kstat *);
536+
extern int afs_getattr(const struct path *, struct kstat *, u32, unsigned int);
537537
extern int afs_setattr(struct dentry *, struct iattr *);
538538
extern void afs_evict_inode(struct inode *);
539539
extern int afs_drop_inode(struct inode *);

fs/bad_inode.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ static int bad_inode_permission(struct inode *inode, int mask)
8989
return -EIO;
9090
}
9191

92-
static int bad_inode_getattr(struct vfsmount *mnt, struct dentry *dentry,
93-
struct kstat *stat)
92+
static int bad_inode_getattr(const struct path *path, struct kstat *stat,
93+
u32 request_mask, unsigned int query_flags)
9494
{
9595
return -EIO;
9696
}

fs/btrfs/inode.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9413,11 +9413,11 @@ int btrfs_init_cachep(void)
94139413
return -ENOMEM;
94149414
}
94159415

9416-
static int btrfs_getattr(struct vfsmount *mnt,
9417-
struct dentry *dentry, struct kstat *stat)
9416+
static int btrfs_getattr(const struct path *path, struct kstat *stat,
9417+
u32 request_mask, unsigned int flags)
94189418
{
94199419
u64 delalloc_bytes;
9420-
struct inode *inode = d_inode(dentry);
9420+
struct inode *inode = d_inode(path->dentry);
94219421
u32 blocksize = inode->i_sb->s_blocksize;
94229422

94239423
generic_fillattr(inode, stat);

fs/ceph/inode.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2187,10 +2187,10 @@ int ceph_permission(struct inode *inode, int mask)
21872187
* Get all attributes. Hopefully somedata we'll have a statlite()
21882188
* and can limit the fields we require to be accurate.
21892189
*/
2190-
int ceph_getattr(struct vfsmount *mnt, struct dentry *dentry,
2191-
struct kstat *stat)
2190+
int ceph_getattr(const struct path *path, struct kstat *stat,
2191+
u32 request_mask, unsigned int flags)
21922192
{
2193-
struct inode *inode = d_inode(dentry);
2193+
struct inode *inode = d_inode(path->dentry);
21942194
struct ceph_inode_info *ci = ceph_inode(inode);
21952195
int err;
21962196

fs/ceph/super.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -784,8 +784,8 @@ static inline int ceph_do_getattr(struct inode *inode, int mask, bool force)
784784
extern int ceph_permission(struct inode *inode, int mask);
785785
extern int __ceph_setattr(struct inode *inode, struct iattr *attr);
786786
extern int ceph_setattr(struct dentry *dentry, struct iattr *attr);
787-
extern int ceph_getattr(struct vfsmount *mnt, struct dentry *dentry,
788-
struct kstat *stat);
787+
extern int ceph_getattr(const struct path *path, struct kstat *stat,
788+
u32 request_mask, unsigned int flags);
789789

790790
/* xattr.c */
791791
int __ceph_setxattr(struct inode *, const char *, const void *, size_t, int);

fs/cifs/cifsfs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ extern int cifs_revalidate_dentry(struct dentry *);
8383
extern int cifs_invalidate_mapping(struct inode *inode);
8484
extern int cifs_revalidate_mapping(struct inode *inode);
8585
extern int cifs_zap_mapping(struct inode *inode);
86-
extern int cifs_getattr(struct vfsmount *, struct dentry *, struct kstat *);
86+
extern int cifs_getattr(const struct path *, struct kstat *, u32, unsigned int);
8787
extern int cifs_setattr(struct dentry *, struct iattr *);
8888

8989
extern const struct inode_operations cifs_file_inode_ops;

fs/cifs/inode.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1990,9 +1990,10 @@ int cifs_revalidate_dentry(struct dentry *dentry)
19901990
return cifs_revalidate_mapping(inode);
19911991
}
19921992

1993-
int cifs_getattr(struct vfsmount *mnt, struct dentry *dentry,
1994-
struct kstat *stat)
1993+
int cifs_getattr(const struct path *path, struct kstat *stat,
1994+
u32 request_mask, unsigned int flags)
19951995
{
1996+
struct dentry *dentry = path->dentry;
19961997
struct cifs_sb_info *cifs_sb = CIFS_SB(dentry->d_sb);
19971998
struct cifs_tcon *tcon = cifs_sb_master_tcon(cifs_sb);
19981999
struct inode *inode = d_inode(dentry);

fs/coda/coda_linux.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ int coda_open(struct inode *i, struct file *f);
4747
int coda_release(struct inode *i, struct file *f);
4848
int coda_permission(struct inode *inode, int mask);
4949
int coda_revalidate_inode(struct inode *);
50-
int coda_getattr(struct vfsmount *, struct dentry *, struct kstat *);
50+
int coda_getattr(const struct path *, struct kstat *, u32, unsigned int);
5151
int coda_setattr(struct dentry *, struct iattr *);
5252

5353
/* this file: heloers */

fs/coda/inode.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,11 +255,12 @@ static void coda_evict_inode(struct inode *inode)
255255
coda_cache_clear_inode(inode);
256256
}
257257

258-
int coda_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
258+
int coda_getattr(const struct path *path, struct kstat *stat,
259+
u32 request_mask, unsigned int flags)
259260
{
260-
int err = coda_revalidate_inode(d_inode(dentry));
261+
int err = coda_revalidate_inode(d_inode(path->dentry));
261262
if (!err)
262-
generic_fillattr(d_inode(dentry), stat);
263+
generic_fillattr(d_inode(path->dentry), stat);
263264
return err;
264265
}
265266

fs/ecryptfs/inode.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -959,9 +959,10 @@ static int ecryptfs_setattr(struct dentry *dentry, struct iattr *ia)
959959
return rc;
960960
}
961961

962-
static int ecryptfs_getattr_link(struct vfsmount *mnt, struct dentry *dentry,
963-
struct kstat *stat)
962+
static int ecryptfs_getattr_link(const struct path *path, struct kstat *stat,
963+
u32 request_mask, unsigned int flags)
964964
{
965+
struct dentry *dentry = path->dentry;
965966
struct ecryptfs_mount_crypt_stat *mount_crypt_stat;
966967
int rc = 0;
967968

@@ -983,13 +984,15 @@ static int ecryptfs_getattr_link(struct vfsmount *mnt, struct dentry *dentry,
983984
return rc;
984985
}
985986

986-
static int ecryptfs_getattr(struct vfsmount *mnt, struct dentry *dentry,
987-
struct kstat *stat)
987+
static int ecryptfs_getattr(const struct path *path, struct kstat *stat,
988+
u32 request_mask, unsigned int flags)
988989
{
990+
struct dentry *dentry = path->dentry;
989991
struct kstat lower_stat;
990992
int rc;
991993

992-
rc = vfs_getattr(ecryptfs_dentry_to_lower_path(dentry), &lower_stat);
994+
rc = vfs_getattr(ecryptfs_dentry_to_lower_path(dentry), &lower_stat,
995+
request_mask, flags);
993996
if (!rc) {
994997
fsstack_copy_attr_all(d_inode(dentry),
995998
ecryptfs_inode_to_lower(d_inode(dentry)));

fs/exportfs/expfs.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,8 @@ static int get_name(const struct path *path, char *name, struct dentry *child)
299299
* filesystem supports 64-bit inode numbers. So we need to
300300
* actually call ->getattr, not just read i_ino:
301301
*/
302-
error = vfs_getattr_nosec(&child_path, &stat);
302+
error = vfs_getattr_nosec(&child_path, &stat,
303+
STATX_INO, AT_STATX_SYNC_AS_STAT);
303304
if (error)
304305
return error;
305306
buffer.ino = stat.ino;

fs/ext4/ext4.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2462,8 +2462,7 @@ extern struct inode *ext4_iget(struct super_block *, unsigned long);
24622462
extern struct inode *ext4_iget_normal(struct super_block *, unsigned long);
24632463
extern int ext4_write_inode(struct inode *, struct writeback_control *);
24642464
extern int ext4_setattr(struct dentry *, struct iattr *);
2465-
extern int ext4_getattr(struct vfsmount *mnt, struct dentry *dentry,
2466-
struct kstat *stat);
2465+
extern int ext4_getattr(const struct path *, struct kstat *, u32, unsigned int);
24672466
extern void ext4_evict_inode(struct inode *);
24682467
extern void ext4_clear_inode(struct inode *);
24692468
extern int ext4_sync_inode(handle_t *, struct inode *);

fs/ext4/inode.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5387,13 +5387,13 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr)
53875387
return error;
53885388
}
53895389

5390-
int ext4_getattr(struct vfsmount *mnt, struct dentry *dentry,
5391-
struct kstat *stat)
5390+
int ext4_getattr(const struct path *path, struct kstat *stat,
5391+
u32 request_mask, unsigned int query_flags)
53925392
{
53935393
struct inode *inode;
53945394
unsigned long long delalloc_blocks;
53955395

5396-
inode = d_inode(dentry);
5396+
inode = d_inode(path->dentry);
53975397
generic_fillattr(inode, stat);
53985398

53995399
/*

fs/f2fs/f2fs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2040,8 +2040,8 @@ int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync);
20402040
void truncate_data_blocks(struct dnode_of_data *dn);
20412041
int truncate_blocks(struct inode *inode, u64 from, bool lock);
20422042
int f2fs_truncate(struct inode *inode);
2043-
int f2fs_getattr(struct vfsmount *mnt, struct dentry *dentry,
2044-
struct kstat *stat);
2043+
int f2fs_getattr(const struct path *path, struct kstat *stat,
2044+
u32 request_mask, unsigned int flags);
20452045
int f2fs_setattr(struct dentry *dentry, struct iattr *attr);
20462046
int truncate_hole(struct inode *inode, pgoff_t pg_start, pgoff_t pg_end);
20472047
int truncate_data_blocks_range(struct dnode_of_data *dn, int count);

fs/f2fs/file.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -633,10 +633,10 @@ int f2fs_truncate(struct inode *inode)
633633
return 0;
634634
}
635635

636-
int f2fs_getattr(struct vfsmount *mnt,
637-
struct dentry *dentry, struct kstat *stat)
636+
int f2fs_getattr(const struct path *path, struct kstat *stat,
637+
u32 request_mask, unsigned int flags)
638638
{
639-
struct inode *inode = d_inode(dentry);
639+
struct inode *inode = d_inode(path->dentry);
640640
generic_fillattr(inode, stat);
641641
stat->blocks <<= 3;
642642
return 0;

fs/fat/fat.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,8 +364,8 @@ extern const struct file_operations fat_file_operations;
364364
extern const struct inode_operations fat_file_inode_operations;
365365
extern int fat_setattr(struct dentry *dentry, struct iattr *attr);
366366
extern void fat_truncate_blocks(struct inode *inode, loff_t offset);
367-
extern int fat_getattr(struct vfsmount *mnt, struct dentry *dentry,
368-
struct kstat *stat);
367+
extern int fat_getattr(const struct path *path, struct kstat *stat,
368+
u32 request_mask, unsigned int flags);
369369
extern int fat_file_fsync(struct file *file, loff_t start, loff_t end,
370370
int datasync);
371371

fs/fat/file.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,9 +365,10 @@ void fat_truncate_blocks(struct inode *inode, loff_t offset)
365365
fat_flush_inodes(inode->i_sb, inode, NULL);
366366
}
367367

368-
int fat_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
368+
int fat_getattr(const struct path *path, struct kstat *stat,
369+
u32 request_mask, unsigned int flags)
369370
{
370-
struct inode *inode = d_inode(dentry);
371+
struct inode *inode = d_inode(path->dentry);
371372
generic_fillattr(inode, stat);
372373
stat->blksize = MSDOS_SB(inode->i_sb)->cluster_size;
373374

fs/fuse/dir.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1777,10 +1777,10 @@ static int fuse_setattr(struct dentry *entry, struct iattr *attr)
17771777
return ret;
17781778
}
17791779

1780-
static int fuse_getattr(struct vfsmount *mnt, struct dentry *entry,
1781-
struct kstat *stat)
1780+
static int fuse_getattr(const struct path *path, struct kstat *stat,
1781+
u32 request_mask, unsigned int flags)
17821782
{
1783-
struct inode *inode = d_inode(entry);
1783+
struct inode *inode = d_inode(path->dentry);
17841784
struct fuse_conn *fc = get_fuse_conn(inode);
17851785

17861786
if (!fuse_allow_current_process(fc))

0 commit comments

Comments
 (0)