Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

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

diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
index edbe37b7f636de145a0eeab9b837aee3120f3a77..0f08153b4994190fcd21d8b4fd9f6914ae908cb4 100644 (file)
--- a/fs/xfs/xfs_reflink.c
+++ b/fs/xfs/xfs_reflink.c
@@ -495,10 +495,8 @@ xfs_reflink_cancel_cow_blocks(
                        ASSERT((*tpp)->t_firstblock == NULLFSBLOCK);
 
                        /* Free the CoW orphan record. */
-                       error = xfs_refcount_free_cow_extent(*tpp,
-                                       del.br_startblock, del.br_blockcount);
-                       if (error)
-                               break;
+                       xfs_refcount_free_cow_extent(*tpp, del.br_startblock,
+                                       del.br_blockcount);
 
                        xfs_bmap_add_free(*tpp, del.br_startblock,
                                          del.br_blockcount, NULL);
@@ -675,15 +673,10 @@ xfs_reflink_end_cow_extent(
        trace_xfs_reflink_cow_remap(ip, &del);
 
        /* Free the CoW orphan record. */
-       error = xfs_refcount_free_cow_extent(tp, del.br_startblock,
-                       del.br_blockcount);
-       if (error)
-               goto out_cancel;
+       xfs_refcount_free_cow_extent(tp, del.br_startblock, del.br_blockcount);
 
        /* Map the new blocks into the data fork. */
-       error = xfs_bmap_map_extent(tp, ip, &del);
-       if (error)
-               goto out_cancel;
+       xfs_bmap_map_extent(tp, ip, &del);
 
        /* Charge this new data fork mapping to the on-disk quota. */
        xfs_trans_mod_dquot_byino(tp, ip, XFS_TRANS_DQ_DELBCOUNT,
@@ -1070,14 +1063,10 @@ xfs_reflink_remap_extent(
                                uirec.br_blockcount, uirec.br_startblock);
 
                /* Update the refcount tree */
-               error = xfs_refcount_increase_extent(tp, &uirec);
-               if (error)
-                       goto out_cancel;
+               xfs_refcount_increase_extent(tp, &uirec);
 
                /* Map the new blocks into the data fork. */
-               error = xfs_bmap_map_extent(tp, ip, &uirec);
-               if (error)
-                       goto out_cancel;
+               xfs_bmap_map_extent(tp, ip, &uirec);
 
                /* Update quota accounting. */
                xfs_trans_mod_dquot_byino(tp, ip, XFS_TRANS_DQ_BCOUNT,