Commit 93bc420e authored by yangerkun's avatar yangerkun Committed by Jan Kara
Browse files

ext2: support statx syscall 



Since statx, every filesystem should fill the attributes/attributes_mask
in routine getattr. But the generic_fillattr has not fill that, so add
ext2_getattr to do this. This can fix generic/424 while testing ext2.

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avataryangerkun <yangerkun@huawei.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 4f5edd82

fs/ext2/ext2.h

+1 −0
Original line number Diff line number Diff line
@@ -774,6 +774,7 @@ extern int ext2_write_inode (struct inode *, struct writeback_control *); 
extern void ext2_evict_inode(struct inode *);

extern int ext2_get_block(struct inode *, sector_t, struct buffer_head *, int);

extern int ext2_setattr (struct dentry *, struct iattr *);

extern int ext2_getattr (const struct path *, struct kstat *, u32, unsigned int);

extern void ext2_set_inode_flags(struct inode *inode);

extern int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,

		       u64 start, u64 len);

fs/ext2/file.c

+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ const struct inode_operations ext2_file_inode_operations = { 
#ifdef CONFIG_EXT2_FS_XATTR

	.listxattr	= ext2_listxattr,

#endif

	.getattr	= ext2_getattr,

	.setattr	= ext2_setattr,

	.get_acl	= ext2_get_acl,

	.set_acl	= ext2_set_acl,

fs/ext2/inode.c

+26 −0
Original line number Diff line number Diff line
@@ -1637,6 +1637,32 @@ int ext2_write_inode(struct inode *inode, struct writeback_control *wbc) 
	return __ext2_write_inode(inode, wbc->sync_mode == WB_SYNC_ALL);

}



int ext2_getattr(const struct path *path, struct kstat *stat,

		u32 request_mask, unsigned int query_falgs)

{

	struct inode *inode = d_inode(path->dentry);

	struct ext2_inode_info *ei = EXT2_I(inode);

	unsigned int flags;



	flags = ei->i_flags & EXT2_FL_USER_VISIBLE;

	if (flags & EXT2_APPEND_FL)

		stat->attributes |= STATX_ATTR_APPEND;

	if (flags & EXT2_COMPR_FL)

		stat->attributes |= STATX_ATTR_COMPRESSED;

	if (flags & EXT2_IMMUTABLE_FL)

		stat->attributes |= STATX_ATTR_IMMUTABLE;

	if (flags & EXT2_NODUMP_FL)

		stat->attributes |= STATX_ATTR_NODUMP;

	stat->attributes_mask |= (STATX_ATTR_APPEND |

			STATX_ATTR_COMPRESSED |

			STATX_ATTR_ENCRYPTED |

			STATX_ATTR_IMMUTABLE |

			STATX_ATTR_NODUMP);



	generic_fillattr(inode, stat);

	return 0;

}



int ext2_setattr(struct dentry *dentry, struct iattr *iattr)

{

	struct inode *inode = d_inode(dentry);

fs/ext2/namei.c

+2 −0
Original line number Diff line number Diff line
@@ -416,6 +416,7 @@ const struct inode_operations ext2_dir_inode_operations = { 
#ifdef CONFIG_EXT2_FS_XATTR

	.listxattr	= ext2_listxattr,

#endif

	.getattr	= ext2_getattr,

	.setattr	= ext2_setattr,

	.get_acl	= ext2_get_acl,

	.set_acl	= ext2_set_acl,
@@ -426,6 +427,7 @@ const struct inode_operations ext2_special_inode_operations = { 
#ifdef CONFIG_EXT2_FS_XATTR

	.listxattr	= ext2_listxattr,

#endif

	.getattr	= ext2_getattr,

	.setattr	= ext2_setattr,

	.get_acl	= ext2_get_acl,

	.set_acl	= ext2_set_acl,

fs/ext2/symlink.c

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


const struct inode_operations ext2_symlink_inode_operations = {

	.get_link	= page_get_link,

	.getattr	= ext2_getattr,

	.setattr	= ext2_setattr,

#ifdef CONFIG_EXT2_FS_XATTR

	.listxattr	= ext2_listxattr,
@@ -31,6 +32,7 @@ const struct inode_operations ext2_symlink_inode_operations = { 
 

const struct inode_operations ext2_fast_symlink_inode_operations = {

	.get_link	= simple_get_link,

	.getattr	= ext2_getattr,

	.setattr	= ext2_setattr,

#ifdef CONFIG_EXT2_FS_XATTR

	.listxattr	= ext2_listxattr,

CRA Git | Maintained and supported by SUSTech CRA and CCSE