leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfs: refactor xfs_inode_verify_forks

Browse Source 
The split between xfs_inode_verify_forks and the two helpers
implementing the actual functionality is a little strange.  Reshuffle
it so that xfs_inode_verify_forks verifies if the data and attr forks
are actually in local format and only call the low-level helpers if
that is the case.  Handle the actual error reporting in the low-level
handlers to streamline the caller.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
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 1934c8bd81
commit 7c7ba21863
3 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -674,34 +674,51 @@ xfs_ifork_init_cow(
} }
/* Verify the inline contents of the data fork of an inode. */ /* Verify the inline contents of the data fork of an inode. */
xfs_failaddr_t int
xfs_ifork_verify_data( xfs_ifork_verify_local_data(
struct xfs_inode *ip) struct xfs_inode *ip)
{ {
/* Non-local data fork, we're done. */ xfs_failaddr_t fa = NULL;
if (ip->i_d.di_format != XFS_DINODE_FMT_LOCAL)
return NULL;
/* Check the inline data fork if there is one. */
switch (VFS_I(ip)->i_mode & S_IFMT) { switch (VFS_I(ip)->i_mode & S_IFMT) {
case S_IFDIR: case S_IFDIR:
return xfs_dir2_sf_verify(ip); fa = xfs_dir2_sf_verify(ip);
break;
case S_IFLNK: case S_IFLNK:
return xfs_symlink_shortform_verify(ip); fa = xfs_symlink_shortform_verify(ip);
break;
default: default:
return NULL; break;
} }
if (fa) {
xfs_inode_verifier_error(ip, -EFSCORRUPTED, "data fork",
ip->i_df.if_u1.if_data, ip->i_df.if_bytes, fa);
return -EFSCORRUPTED;
}
return 0;
} }
/* Verify the inline contents of the attr fork of an inode. */ /* Verify the inline contents of the attr fork of an inode. */
xfs_failaddr_t int
xfs_ifork_verify_attr( xfs_ifork_verify_local_attr(
struct xfs_inode *ip) struct xfs_inode *ip)
{ {
/* There has to be an attr fork allocated if aformat is local. */ struct xfs_ifork *ifp = ip->i_afp;
if (ip->i_d.di_aformat != XFS_DINODE_FMT_LOCAL) xfs_failaddr_t fa;
return NULL;
if (!XFS_IFORK_PTR(ip, XFS_ATTR_FORK)) if (!ifp)
return __this_address; fa = __this_address;
return xfs_attr_shortform_verify(ip); else
fa = xfs_attr_shortform_verify(ip);
if (fa) {
xfs_inode_verifier_error(ip, -EFSCORRUPTED, "attr fork",
ifp ? ifp->if_u1.if_data : NULL,
ifp ? ifp->if_bytes : 0, fa);
return -EFSCORRUPTED;
}
return 0;
} }

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

@ -176,7 +176,7 @@ extern struct kmem_zone *xfs_ifork_zone;
extern void xfs_ifork_init_cow(struct xfs_inode *ip); extern void xfs_ifork_init_cow(struct xfs_inode *ip);
xfs_failaddr_t xfs_ifork_verify_data(struct xfs_inode *ip); int xfs_ifork_verify_local_data(struct xfs_inode *ip);
xfs_failaddr_t xfs_ifork_verify_attr(struct xfs_inode *ip); int xfs_ifork_verify_local_attr(struct xfs_inode *ip);
#endif /* __XFS_INODE_FORK_H__ */ #endif /* __XFS_INODE_FORK_H__ */

21
fs/xfs/xfs_inode.c
View File

@ -3715,25 +3715,12 @@ bool
xfs_inode_verify_forks( xfs_inode_verify_forks(
struct xfs_inode *ip) struct xfs_inode *ip)
{ {
struct xfs_ifork *ifp; if (ip->i_d.di_format == XFS_DINODE_FMT_LOCAL &&
xfs_failaddr_t fa; xfs_ifork_verify_local_data(ip))
fa = xfs_ifork_verify_data(ip);
if (fa) {
ifp = XFS_IFORK_PTR(ip, XFS_DATA_FORK);
xfs_inode_verifier_error(ip, -EFSCORRUPTED, "data fork",
ifp->if_u1.if_data, ifp->if_bytes, fa);
return false; return false;
} if (ip->i_d.di_aformat == XFS_DINODE_FMT_LOCAL &&
xfs_ifork_verify_local_attr(ip))
fa = xfs_ifork_verify_attr(ip);
if (fa) {
ifp = XFS_IFORK_PTR(ip, XFS_ATTR_FORK);
xfs_inode_verifier_error(ip, -EFSCORRUPTED, "attr fork",
ifp ? ifp->if_u1.if_data : NULL,
ifp ? ifp->if_bytes : 0, fa);
return false; return false;
}
return true; return true;
} }