xfs: minor cleanup for xfs_get_blocks
authorChristoph Hellwig <hch@lst.de>
Wed, 14 Mar 2018 06:15:32 +0000 (23:15 -0700)
committerDarrick J. Wong <darrick.wong@oracle.com>
Thu, 15 Mar 2018 17:31:38 +0000 (10:31 -0700)
Simplify the control flow a bit in preparation for O_ATOMIC-related
changes.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
fs/xfs/xfs_aops.c

index c79a3ca..19eadc8 100644 (file)
@@ -1335,17 +1335,16 @@ xfs_get_blocks(
                        &nimaps, 0);
        if (error)
                goto out_unlock;
-
-       if (nimaps) {
-               trace_xfs_get_blocks_found(ip, offset, size,
-                       imap.br_state == XFS_EXT_UNWRITTEN ?
-                               XFS_IO_UNWRITTEN : XFS_IO_OVERWRITE, &imap);
-               xfs_iunlock(ip, lockmode);
-       } else {
+       if (!nimaps) {
                trace_xfs_get_blocks_notfound(ip, offset, size);
                goto out_unlock;
        }
 
+       trace_xfs_get_blocks_found(ip, offset, size,
+               imap.br_state == XFS_EXT_UNWRITTEN ?
+                       XFS_IO_UNWRITTEN : XFS_IO_OVERWRITE, &imap);
+       xfs_iunlock(ip, lockmode);
+
        /* trim mapping down to size requested */
        xfs_map_trim_size(inode, iblock, bh_result, &imap, offset, size);