xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions 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
Download Patch File Download Diff File Expand all files Collapse all files

21
fs/xfs/xfs_inode.c
View File

@@ -3715,25 +3715,12 @@ bool
xfs_inode_verify_forks(
struct xfs_inode *ip)
{
struct xfs_ifork *ifp;
xfs_failaddr_t fa;
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);
if (ip->i_d.di_format == XFS_DINODE_FMT_LOCAL &&
xfs_ifork_verify_local_data(ip))
return false;
}
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);
if (ip->i_d.di_aformat == XFS_DINODE_FMT_LOCAL &&
xfs_ifork_verify_local_attr(ip))
return false;
}
return true;
}