xfs: decrease indenting problems in xfs_dabuf_map

Source kernel commit: ee4fb16cbec9aa1ce6e837d143f411ee42df1bb5

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>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/xfs_da_btree.c b/libxfs/xfs_da_btree.c
index 93a500da6675d9c4679c263decd3a962a2217d0c..d88435c46649bf7a3a85729e66f595d8944248c0 100644 (file)
--- a/libxfs/xfs_da_btree.c
+++ b/libxfs/xfs_da_btree.c
@@ -2564,26 +2564,30 @@ xfs_dabuf_map(
        }
 
        if (!xfs_da_map_covers_blocks(nirecs, irecs, bno, nfsb)) {
-               error = mappedbno == -2 ? -1 : -EFSCORRUPTED;
-               if (unlikely(error == -EFSCORRUPTED)) {
-                       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,
+               /* Caller ok with no mapping. */
+               if (mappedbno == -2) {
+                       error = -1;
+                       goto out;
+               }
+
+               /* 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);
-                               }
+                                       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);
                }
+               XFS_ERROR_REPORT("xfs_da_do_buf(1)", XFS_ERRLEVEL_LOW, mp);
+               error = -EFSCORRUPTED;
                goto out;
        }
        error = xfs_buf_map_from_irec(mp, map, nmaps, irecs, nirecs);