xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfs: remove xfs_ifork_ops

Browse Source 
xfs_ifork_ops add up to two indirect calls per inode read and flush,
despite just having a single instance in the kernel.  In xfsprogs
phase6 in xfs_repair overrides the verify_dir method to deal with inodes
that do not have a valid parent, but that can be fixed pretty easily
by ensuring they always have a valid looking parent.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
Christoph Hellwig
2020-05-14 14:01:19 -07:00
committed by Darrick J. Wong
parent bb8a66af4f
commit 1934c8bd81
3 changed files with 9 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
fs/xfs/libxfs/xfs_inode_fork.c
View File

@@ -673,18 +673,10 @@ xfs_ifork_init_cow(
ip->i_cnextents = 0;
}
/* Default fork content verifiers. */
struct xfs_ifork_ops xfs_default_ifork_ops = {
.verify_attr = xfs_attr_shortform_verify,
.verify_dir = xfs_dir2_sf_verify,
.verify_symlink = xfs_symlink_shortform_verify,
};
/* Verify the inline contents of the data fork of an inode. */
xfs_failaddr_t
xfs_ifork_verify_data(
struct xfs_inode *ip,
struct xfs_ifork_ops *ops)
struct xfs_inode *ip)
{
/* Non-local data fork, we're done. */
if (ip->i_d.di_format != XFS_DINODE_FMT_LOCAL)
@@ -693,9 +685,9 @@ xfs_ifork_verify_data(
/* Check the inline data fork if there is one. */
switch (VFS_I(ip)->i_mode & S_IFMT) {
case S_IFDIR:
return ops->verify_dir(ip);
return xfs_dir2_sf_verify(ip);
case S_IFLNK:
return ops->verify_symlink(ip);
return xfs_symlink_shortform_verify(ip);
default:
return NULL;
}
@@ -704,13 +696,12 @@ xfs_ifork_verify_data(
/* Verify the inline contents of the attr fork of an inode. */
xfs_failaddr_t
xfs_ifork_verify_attr(
struct xfs_inode *ip,
struct xfs_ifork_ops *ops)
struct xfs_inode *ip)
{
/* There has to be an attr fork allocated if aformat is local. */
if (ip->i_d.di_aformat != XFS_DINODE_FMT_LOCAL)
return NULL;
if (!XFS_IFORK_PTR(ip, XFS_ATTR_FORK))
return __this_address;
return ops->verify_attr(ip);
return xfs_attr_shortform_verify(ip);
}

15
fs/xfs/libxfs/xfs_inode_fork.h
View File

@@ -176,18 +176,7 @@ extern struct kmem_zone *xfs_ifork_zone;
extern void xfs_ifork_init_cow(struct xfs_inode *ip);
typedef xfs_failaddr_t (*xfs_ifork_verifier_t)(struct xfs_inode *);
struct xfs_ifork_ops {
xfs_ifork_verifier_t verify_symlink;
xfs_ifork_verifier_t verify_dir;
xfs_ifork_verifier_t verify_attr;
};
extern struct xfs_ifork_ops xfs_default_ifork_ops;
xfs_failaddr_t xfs_ifork_verify_data(struct xfs_inode *ip,
struct xfs_ifork_ops *ops);
xfs_failaddr_t xfs_ifork_verify_attr(struct xfs_inode *ip,
struct xfs_ifork_ops *ops);
xfs_failaddr_t xfs_ifork_verify_data(struct xfs_inode *ip);
xfs_failaddr_t xfs_ifork_verify_attr(struct xfs_inode *ip);
#endif /* __XFS_INODE_FORK_H__ */