[PATCH 05/12] statx: Ext4: Return enhanced file attributes
From: David Howells <dhowells@redhat.com>
Date: 2015-11-20 14:55:22
Also in:
linux-cifs, linux-fsdevel, linux-nfs, lkml
Subsystem:
ext4 file system, filesystems (vfs and infrastructure), the rest · Maintainers:
"Theodore Ts'o", Alexander Viro, Christian Brauner, Linus Torvalds
Return enhanced file attributes from the Ext4 filesystem. This includes
the following:
(1) The inode creation time (i_crtime) as i_btime, setting STATX_BTIME.
(2) The inode i_version as st_version if a file with I_VERSION set or a
directory, setting STATX_VERSION.
(3) FS_xxx_FL flags are returned as for ioctl(FS_IOC_GETFLAGS), setting
STATX_IOC_FLAGS.
This requires that all ext4 inodes have a getattr call, not just some of
them, so to this end, split the ext4_getattr() function and only call part
of it where appropriate.
Example output:
[root@andromeda ~]# ./samples/statx/test-statx /usr
statx(/usr) = 0
results=37ef
Size: 4096 Blocks: 16 IO Block: 4096 directory
Device: 08:02 Inode: 1572865 Links: 14
Access: (0755/drwxr-xr-x) Uid: 0 Gid: 0
Access: 2015-11-03 16:12:30.000000000+0000
Modify: 2013-10-18 15:29:18.000000000+0100
Change: 2013-10-18 15:29:18.000000000+0100
Data version: 2fh
Inode flags: 00000000 (-------- -------- -------- --------)
IO-blocksize: blksize=4096
Signed-off-by: David Howells <dhowells@redhat.com>
---
fs/ext4/ext4.h | 2 ++
fs/ext4/file.c | 2 +-
fs/ext4/inode.c | 31 ++++++++++++++++++++++++++++---
fs/ext4/namei.c | 2 ++
fs/ext4/symlink.c | 2 ++
5 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 31efcd78bf51..606f94ba455c 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h@@ -2302,6 +2302,8 @@ extern int ext4_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat); extern void ext4_evict_inode(struct inode *); extern void ext4_clear_inode(struct inode *); +extern int ext4_file_getattr(struct vfsmount *mnt, struct dentry *dentry, + struct kstat *stat); extern int ext4_sync_inode(handle_t *, struct inode *); extern void ext4_dirty_inode(struct inode *, int); extern int ext4_change_inode_journal_flag(struct inode *, int);
diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index 113837e7ba98..3b6fe04b199e 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c@@ -712,7 +712,7 @@ const struct file_operations ext4_file_operations = { const struct inode_operations ext4_file_inode_operations = { .setattr = ext4_setattr, - .getattr = ext4_getattr, + .getattr = ext4_file_getattr, .setxattr = generic_setxattr, .getxattr = generic_getxattr, .listxattr = ext4_listxattr,
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 612fbcf76b5c..c86ff971d8bc 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c@@ -4818,11 +4818,36 @@ err_out: int ext4_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat) { - struct inode *inode; - unsigned long long delalloc_blocks; + struct inode *inode = d_inode(dentry); + struct ext4_inode *raw_inode; + struct ext4_inode_info *ei = EXT4_I(inode); + + if (EXT4_FITS_IN_INODE(raw_inode, ei, i_crtime)) { + stat->result_mask |= STATX_BTIME; + stat->btime.tv_sec = ei->i_crtime.tv_sec; + stat->btime.tv_nsec = ei->i_crtime.tv_nsec; + } + + if (S_ISDIR(inode->i_mode) || IS_I_VERSION(inode)) { + stat->result_mask |= STATX_VERSION; + stat->version = inode->i_version; + } + + ext4_get_inode_flags(ei); + stat->ioc_flags |= ei->i_flags & EXT4_FL_USER_VISIBLE; + stat->result_mask |= STATX_IOC_FLAGS; - inode = d_inode(dentry); generic_fillattr(inode, stat); + return 0; +} + +int ext4_file_getattr(struct vfsmount *mnt, struct dentry *dentry, + struct kstat *stat) +{ + struct inode *inode = dentry->d_inode; + u64 delalloc_blocks; + + ext4_getattr(mnt, dentry, stat); /* * If there is inline data in the inode, the inode will normally not
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 9f61e7679a6d..1f18e61c4f8a 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c@@ -3848,6 +3848,7 @@ const struct inode_operations ext4_dir_inode_operations = { .tmpfile = ext4_tmpfile, .rename2 = ext4_rename2, .setattr = ext4_setattr, + .getattr = ext4_getattr, .setxattr = generic_setxattr, .getxattr = generic_getxattr, .listxattr = ext4_listxattr,
@@ -3859,6 +3860,7 @@ const struct inode_operations ext4_dir_inode_operations = { const struct inode_operations ext4_special_inode_operations = { .setattr = ext4_setattr, + .getattr = ext4_getattr, .setxattr = generic_setxattr, .getxattr = generic_getxattr, .listxattr = ext4_listxattr,
diff --git a/fs/ext4/symlink.c b/fs/ext4/symlink.c
index c677f2c1044b..89c9d27c6319 100644
--- a/fs/ext4/symlink.c
+++ b/fs/ext4/symlink.c@@ -106,6 +106,7 @@ const struct inode_operations ext4_symlink_inode_operations = { .follow_link = page_follow_link_light, .put_link = page_put_link, .setattr = ext4_setattr, + .getattr = ext4_getattr, .setxattr = generic_setxattr, .getxattr = generic_getxattr, .listxattr = ext4_listxattr,
@@ -116,6 +117,7 @@ const struct inode_operations ext4_fast_symlink_inode_operations = { .readlink = generic_readlink, .follow_link = simple_follow_link, .setattr = ext4_setattr, + .getattr = ext4_getattr, .setxattr = generic_setxattr, .getxattr = generic_getxattr, .listxattr = ext4_listxattr,