summaryrefslogtreecommitdiffstats
path: root/fs/libfs.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-03-03 14:38:56 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2017-03-03 14:38:56 -0500
commit590dce2d4934fb909b112cd80c80486362337744 (patch)
tree9c46dfa627c0adb639ee1542fffbc2262727ef36 /fs/libfs.c
parente0d072250a54669dce876d8ade70e417356aae74 (diff)
parenta528d35e8bfcc521d7cb70aaf03e1bd296c8493f (diff)
Merge branch 'rebased-statx' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs 'statx()' update from Al Viro. This adds the new extended stat() interface that internally subsumes our previous stat interfaces, and allows user mode to specify in more detail what kind of information it wants. It also allows for some explicit synchronization information to be passed to the filesystem, which can be relevant for network filesystems: is the cached value ok, or do you need open/close consistency, or what? From David Howells. Andreas Dilger points out that the first version of the extended statx interface was posted June 29, 2010: https://www.spinics.net/lists/linux-fsdevel/msg33831.html * 'rebased-statx' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: statx: Add a system call to make enhanced file info available
Diffstat (limited to 'fs/libfs.c')
-rw-r--r--fs/libfs.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/libfs.c b/fs/libfs.c
index 217896ca4fae..a8b62e5d43a9 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -21,10 +21,10 @@
21 21
22#include "internal.h" 22#include "internal.h"
23 23
24int simple_getattr(struct vfsmount *mnt, struct dentry *dentry, 24int simple_getattr(const struct path *path, struct kstat *stat,
25 struct kstat *stat) 25 u32 request_mask, unsigned int query_flags)
26{ 26{
27 struct inode *inode = d_inode(dentry); 27 struct inode *inode = d_inode(path->dentry);
28 generic_fillattr(inode, stat); 28 generic_fillattr(inode, stat);
29 stat->blocks = inode->i_mapping->nrpages << (PAGE_SHIFT - 9); 29 stat->blocks = inode->i_mapping->nrpages << (PAGE_SHIFT - 9);
30 return 0; 30 return 0;
@@ -1144,10 +1144,10 @@ static struct dentry *empty_dir_lookup(struct inode *dir, struct dentry *dentry,
1144 return ERR_PTR(-ENOENT); 1144 return ERR_PTR(-ENOENT);
1145} 1145}
1146 1146
1147static int empty_dir_getattr(struct vfsmount *mnt, struct dentry *dentry, 1147static int empty_dir_getattr(const struct path *path, struct kstat *stat,
1148 struct kstat *stat) 1148 u32 request_mask, unsigned int query_flags)
1149{ 1149{
1150 struct inode *inode = d_inode(dentry); 1150 struct inode *inode = d_inode(path->dentry);
1151 generic_fillattr(inode, stat); 1151 generic_fillattr(inode, stat);
1152 return 0; 1152 return 0;
1153} 1153}