Commit 1934c8bd authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: remove xfs_ifork_ops 



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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent bb8a66af

fs/xfs/libxfs/xfs_inode_fork.c

+5 −14
Original line number Diff line number Diff line
@@ -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);

}

fs/xfs/libxfs/xfs_inode_fork.h

+2 −13
Original line number Diff line number Diff line
@@ -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__ */

fs/xfs/xfs_inode.c

+2 −2
Original line number Diff line number Diff line
@@ -3718,7 +3718,7 @@ xfs_inode_verify_forks( 
	struct xfs_ifork	*ifp;

	xfs_failaddr_t		fa;



	fa = xfs_ifork_verify_data(ip, &xfs_default_ifork_ops);

	fa = xfs_ifork_verify_data(ip);

	if (fa) {

		ifp = XFS_IFORK_PTR(ip, XFS_DATA_FORK);

		xfs_inode_verifier_error(ip, -EFSCORRUPTED, "data fork",
@@ -3726,7 +3726,7 @@ xfs_inode_verify_forks( 
		return false;

	}



	fa = xfs_ifork_verify_attr(ip, &xfs_default_ifork_ops);

	fa = xfs_ifork_verify_attr(ip);

	if (fa) {

		ifp = XFS_IFORK_PTR(ip, XFS_ATTR_FORK);

		xfs_inode_verifier_error(ip, -EFSCORRUPTED, "attr fork",