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

xfs: decrease indenting problems in xfs_dabuf_map

Browse Source 
Refactor the code that complains when a dir/attr mapping doesn't exist
but the caller requires a mapping.  This small restructuring helps us to
reduce the indenting level.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Darrick J. Wong 2019-11-02 09:41:18 -07:00
parent 50f8300904
commit ee4fb16cbe
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
fs/xfs/libxfs/xfs_da_btree.c
View File

@ -2567,26 +2567,30 @@ xfs_dabuf_map(
} }
if (!xfs_da_map_covers_blocks(nirecs, irecs, bno, nfsb)) { if (!xfs_da_map_covers_blocks(nirecs, irecs, bno, nfsb)) {
error = mappedbno == -2 ? -1 : -EFSCORRUPTED; /* Caller ok with no mapping. */
if (unlikely(error == -EFSCORRUPTED)) { if (mappedbno == -2) {
if (xfs_error_level >= XFS_ERRLEVEL_LOW) { error = -1;
int i; goto out;
xfs_alert(mp, "%s: bno %lld dir: inode %lld",
__func__, (long long)bno,
(long long)dp->i_ino);
for (i = 0; i < *nmaps; i++) {
xfs_alert(mp,
"[%02d] br_startoff %lld br_startblock %lld br_blockcount %lld br_state %d",
i,
(long long)irecs[i].br_startoff,
(long long)irecs[i].br_startblock,
(long long)irecs[i].br_blockcount,
irecs[i].br_state);
}
}
XFS_ERROR_REPORT("xfs_da_do_buf(1)",
XFS_ERRLEVEL_LOW, mp);
} }
/* Caller expected a mapping, so abort. */
if (xfs_error_level >= XFS_ERRLEVEL_LOW) {
int i;
xfs_alert(mp, "%s: bno %lld dir: inode %lld", __func__,
(long long)bno, (long long)dp->i_ino);
for (i = 0; i < *nmaps; i++) {
xfs_alert(mp,
"[%02d] br_startoff %lld br_startblock %lld br_blockcount %lld br_state %d",
i,
(long long)irecs[i].br_startoff,
(long long)irecs[i].br_startblock,
(long long)irecs[i].br_blockcount,
irecs[i].br_state);
}
}
XFS_ERROR_REPORT("xfs_da_do_buf(1)", XFS_ERRLEVEL_LOW, mp);
error = -EFSCORRUPTED;
goto out; goto out;
} }
error = xfs_buf_map_from_irec(mp, map, nmaps, irecs, nirecs); error = xfs_buf_map_from_irec(mp, map, nmaps, irecs, nirecs);