Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux.git] / fs / xfs / xfs_bmap_util.c

diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
index 98c6a7a714276b11fe2cb373bca5c50c8e18465a..0910cb75b65d77b356d1cde4f38662d48a7d9367 100644 (file)
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -39,9 +39,9 @@
 xfs_daddr_t
 xfs_fsb_to_db(struct xfs_inode *ip, xfs_fsblock_t fsb)
 {
-       return (XFS_IS_REALTIME_INODE(ip) ? \
-                (xfs_daddr_t)XFS_FSB_TO_BB((ip)->i_mount, (fsb)) : \
-                XFS_FSB_TO_DADDR((ip)->i_mount, (fsb)));
+       if (XFS_IS_REALTIME_INODE(ip))
+               return XFS_FSB_TO_BB(ip->i_mount, fsb);
+       return XFS_FSB_TO_DADDR(ip->i_mount, fsb);
 }
 
 /*
@@ -1532,24 +1532,16 @@ xfs_swap_extent_rmap(
                        trace_xfs_swap_extent_rmap_remap_piece(tip, &uirec);
 
                        /* Remove the mapping from the donor file. */
-                       error = xfs_bmap_unmap_extent(tp, tip, &uirec);
-                       if (error)
-                               goto out;
+                       xfs_bmap_unmap_extent(tp, tip, &uirec);
 
                        /* Remove the mapping from the source file. */
-                       error = xfs_bmap_unmap_extent(tp, ip, &irec);
-                       if (error)
-                               goto out;
+                       xfs_bmap_unmap_extent(tp, ip, &irec);
 
                        /* Map the donor file's blocks into the source file. */
-                       error = xfs_bmap_map_extent(tp, ip, &uirec);
-                       if (error)
-                               goto out;
+                       xfs_bmap_map_extent(tp, ip, &uirec);
 
                        /* Map the source file's blocks into the donor file. */
-                       error = xfs_bmap_map_extent(tp, tip, &irec);
-                       if (error)
-                               goto out;
+                       xfs_bmap_map_extent(tp, tip, &irec);
 
                        error = xfs_defer_finish(tpp);
                        tp = *tpp;