4 files changed, 36 insertions, 52 deletions

diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index 65f4348af9ae..e82a3ff345af 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -1985,11 +1985,8 @@ xfs_bmap_add_extent_delay_real(
         }
 
         /* add reverse mapping unless caller opted out */
-        if (!(bma->flags & XFS_BMAPI_NORMAP)) {
-                error = xfs_rmap_map_extent(bma->tp, bma->ip, whichfork, new);
-                if (error)
-                        goto done;
-        }
+        if (!(bma->flags & XFS_BMAPI_NORMAP))
+                xfs_rmap_map_extent(bma->tp, bma->ip, whichfork, new);
 
         /* convert to a btree if necessary */
         if (xfs_bmap_needs_btree(bma->ip, whichfork)) {
@@ -2471,9 +2468,7 @@ xfs_bmap_add_extent_unwritten_real(
         }
 
         /* update reverse mappings */
-        error = xfs_rmap_convert_extent(mp, tp, ip, whichfork, new);
-        if (error)
-                goto done;
+        xfs_rmap_convert_extent(mp, tp, ip, whichfork, new);
 
         /* convert to a btree if necessary */
         if (xfs_bmap_needs_btree(ip, whichfork)) {
@@ -2832,11 +2827,8 @@ xfs_bmap_add_extent_hole_real(
         }
 
         /* add reverse mapping unless caller opted out */
-        if (!(flags & XFS_BMAPI_NORMAP)) {
-                error = xfs_rmap_map_extent(tp, ip, whichfork, new);
-                if (error)
-                        goto done;
-        }
+        if (!(flags & XFS_BMAPI_NORMAP))
+                xfs_rmap_map_extent(tp, ip, whichfork, new);
 
         /* convert to a btree if necessary */
         if (xfs_bmap_needs_btree(ip, whichfork)) {
@@ -5149,9 +5141,7 @@ xfs_bmap_del_extent_real(
         }
 
         /* remove reverse mapping */
-        error = xfs_rmap_unmap_extent(tp, ip, whichfork, del);
-        if (error)
-                goto done;
+        xfs_rmap_unmap_extent(tp, ip, whichfork, del);
 
         /*
          * If we need to, add to list of extents to delete.
@@ -5651,12 +5641,11 @@ done:
                         &new);
 
         /* update reverse mapping. rmap functions merge the rmaps for us */
-        error = xfs_rmap_unmap_extent(tp, ip, whichfork, got);
-        if (error)
-                return error;
+        xfs_rmap_unmap_extent(tp, ip, whichfork, got);
         memcpy(&new, got, sizeof(new));
         new.br_startoff = left->br_startoff + left->br_blockcount;
-        return xfs_rmap_map_extent(tp, ip, whichfork, &new);
+        xfs_rmap_map_extent(tp, ip, whichfork, &new);
+        return 0;
 }
 
 static int
@@ -5695,10 +5684,9 @@ xfs_bmap_shift_update_extent(
                         got);
 
         /* update reverse mapping */
-        error = xfs_rmap_unmap_extent(tp, ip, whichfork, &prev);
-        if (error)
-                return error;
-        return xfs_rmap_map_extent(tp, ip, whichfork, got);
+        xfs_rmap_unmap_extent(tp, ip, whichfork, &prev);
+        xfs_rmap_map_extent(tp, ip, whichfork, got);
+        return 0;
 }
 
 int
diff --git a/fs/xfs/libxfs/xfs_refcount.c b/fs/xfs/libxfs/xfs_refcount.c
index 14b9e3e056cc..a5edac834843 100644
--- a/fs/xfs/libxfs/xfs_refcount.c
+++ b/fs/xfs/libxfs/xfs_refcount.c
@@ -1558,8 +1558,9 @@ xfs_refcount_alloc_cow_extent(
                 return error;
 
         /* Add rmap entry */
-        return xfs_rmap_alloc_extent(tp, XFS_FSB_TO_AGNO(mp, fsb),
+        xfs_rmap_alloc_extent(tp, XFS_FSB_TO_AGNO(mp, fsb),
                         XFS_FSB_TO_AGBNO(mp, fsb), len, XFS_RMAP_OWN_COW);
+        return 0;
 }
 
 /* Forget a CoW staging event in the refcount btree. */
@@ -1570,17 +1571,13 @@ xfs_refcount_free_cow_extent(
         xfs_extlen_t                    len)
 {
         struct xfs_mount                *mp = tp->t_mountp;
-        int                             error;
 
         if (!xfs_sb_version_hasreflink(&mp->m_sb))
                 return 0;
 
         /* Remove rmap entry */
-        error = xfs_rmap_free_extent(tp, XFS_FSB_TO_AGNO(mp, fsb),
+        xfs_rmap_free_extent(tp, XFS_FSB_TO_AGNO(mp, fsb),
                         XFS_FSB_TO_AGBNO(mp, fsb), len, XFS_RMAP_OWN_COW);
-        if (error)
-                return error;
-
         return __xfs_refcount_add(tp, XFS_REFCOUNT_FREE_COW, fsb, len);
 }
 
diff --git a/fs/xfs/libxfs/xfs_rmap.c b/fs/xfs/libxfs/xfs_rmap.c
index 0769aca4192b..28c87ead80ba 100644
--- a/fs/xfs/libxfs/xfs_rmap.c
+++ b/fs/xfs/libxfs/xfs_rmap.c
@@ -2268,7 +2268,7 @@ xfs_rmap_update_is_needed(
  * Record a rmap intent; the list is kept sorted first by AG and then by
  * increasing age.
  */
-static int
+static void
 __xfs_rmap_add(
         struct xfs_trans                *tp,
         enum xfs_rmap_intent_type       type,
@@ -2295,11 +2295,10 @@ __xfs_rmap_add(
         ri->ri_bmap = *bmap;
 
         xfs_defer_add(tp, XFS_DEFER_OPS_TYPE_RMAP, &ri->ri_list);
-        return 0;
 }
 
 /* Map an extent into a file. */
-int
+void
 xfs_rmap_map_extent(
         struct xfs_trans        *tp,
         struct xfs_inode        *ip,
@@ -2307,15 +2306,15 @@ xfs_rmap_map_extent(
         struct xfs_bmbt_irec    *PREV)
 {
         if (!xfs_rmap_update_is_needed(tp->t_mountp, whichfork))
-                return 0;
+                return;
 
-        return __xfs_rmap_add(tp, xfs_is_reflink_inode(ip) ?
+        __xfs_rmap_add(tp, xfs_is_reflink_inode(ip) ?
                         XFS_RMAP_MAP_SHARED : XFS_RMAP_MAP, ip->i_ino,
                         whichfork, PREV);
 }
 
 /* Unmap an extent out of a file. */
-int
+void
 xfs_rmap_unmap_extent(
         struct xfs_trans        *tp,
         struct xfs_inode        *ip,
@@ -2323,9 +2322,9 @@ xfs_rmap_unmap_extent(
         struct xfs_bmbt_irec    *PREV)
 {
         if (!xfs_rmap_update_is_needed(tp->t_mountp, whichfork))
-                return 0;
+                return;
 
-        return __xfs_rmap_add(tp, xfs_is_reflink_inode(ip) ?
+        __xfs_rmap_add(tp, xfs_is_reflink_inode(ip) ?
                         XFS_RMAP_UNMAP_SHARED : XFS_RMAP_UNMAP, ip->i_ino,
                         whichfork, PREV);
 }
@@ -2336,7 +2335,7 @@ xfs_rmap_unmap_extent(
  * Note that tp can be NULL here as no transaction is used for COW fork
  * unwritten conversion.
  */
-int
+void
 xfs_rmap_convert_extent(
         struct xfs_mount        *mp,
         struct xfs_trans        *tp,
@@ -2345,15 +2344,15 @@ xfs_rmap_convert_extent(
         struct xfs_bmbt_irec    *PREV)
 {
         if (!xfs_rmap_update_is_needed(mp, whichfork))
-                return 0;
+                return;
 
-        return __xfs_rmap_add(tp, xfs_is_reflink_inode(ip) ?
+        __xfs_rmap_add(tp, xfs_is_reflink_inode(ip) ?
                         XFS_RMAP_CONVERT_SHARED : XFS_RMAP_CONVERT, ip->i_ino,
                         whichfork, PREV);
 }
 
 /* Schedule the creation of an rmap for non-file data. */
-int
+void
 xfs_rmap_alloc_extent(
         struct xfs_trans        *tp,
         xfs_agnumber_t          agno,
@@ -2364,18 +2363,18 @@ xfs_rmap_alloc_extent(
         struct xfs_bmbt_irec    bmap;
 
         if (!xfs_rmap_update_is_needed(tp->t_mountp, XFS_DATA_FORK))
-                return 0;
+                return;
 
         bmap.br_startblock = XFS_AGB_TO_FSB(tp->t_mountp, agno, bno);
         bmap.br_blockcount = len;
         bmap.br_startoff = 0;
         bmap.br_state = XFS_EXT_NORM;
 
-        return __xfs_rmap_add(tp, XFS_RMAP_ALLOC, owner, XFS_DATA_FORK, &bmap);
+        __xfs_rmap_add(tp, XFS_RMAP_ALLOC, owner, XFS_DATA_FORK, &bmap);
 }
 
 /* Schedule the deletion of an rmap for non-file data. */
-int
+void
 xfs_rmap_free_extent(
         struct xfs_trans        *tp,
         xfs_agnumber_t          agno,
@@ -2386,14 +2385,14 @@ xfs_rmap_free_extent(
         struct xfs_bmbt_irec    bmap;
 
         if (!xfs_rmap_update_is_needed(tp->t_mountp, XFS_DATA_FORK))
-                return 0;
+                return;
 
         bmap.br_startblock = XFS_AGB_TO_FSB(tp->t_mountp, agno, bno);
         bmap.br_blockcount = len;
         bmap.br_startoff = 0;
         bmap.br_state = XFS_EXT_NORM;
 
-        return __xfs_rmap_add(tp, XFS_RMAP_FREE, owner, XFS_DATA_FORK, &bmap);
+        __xfs_rmap_add(tp, XFS_RMAP_FREE, owner, XFS_DATA_FORK, &bmap);
 }
 
 /* Compare rmap records.  Returns -1 if a < b, 1 if a > b, and 0 if equal. */
diff --git a/fs/xfs/libxfs/xfs_rmap.h b/fs/xfs/libxfs/xfs_rmap.h
index e21ed0294e5c..0c2c3cb73429 100644
--- a/fs/xfs/libxfs/xfs_rmap.h
+++ b/fs/xfs/libxfs/xfs_rmap.h
@@ -161,16 +161,16 @@ struct xfs_rmap_intent {
 };
 
 /* functions for updating the rmapbt based on bmbt map/unmap operations */
-int xfs_rmap_map_extent(struct xfs_trans *tp, struct xfs_inode *ip,
+void xfs_rmap_map_extent(struct xfs_trans *tp, struct xfs_inode *ip,
                 int whichfork, struct xfs_bmbt_irec *imap);
-int xfs_rmap_unmap_extent(struct xfs_trans *tp, struct xfs_inode *ip,
+void xfs_rmap_unmap_extent(struct xfs_trans *tp, struct xfs_inode *ip,
                 int whichfork, struct xfs_bmbt_irec *imap);
-int xfs_rmap_convert_extent(struct xfs_mount *mp, struct xfs_trans *tp,
+void xfs_rmap_convert_extent(struct xfs_mount *mp, struct xfs_trans *tp,
                 struct xfs_inode *ip, int whichfork,
                 struct xfs_bmbt_irec *imap);
-int xfs_rmap_alloc_extent(struct xfs_trans *tp, xfs_agnumber_t agno,
+void xfs_rmap_alloc_extent(struct xfs_trans *tp, xfs_agnumber_t agno,
                 xfs_agblock_t bno, xfs_extlen_t len, uint64_t owner);
-int xfs_rmap_free_extent(struct xfs_trans *tp, xfs_agnumber_t agno,
+void xfs_rmap_free_extent(struct xfs_trans *tp, xfs_agnumber_t agno,
                 xfs_agblock_t bno, xfs_extlen_t len, uint64_t owner);
 
 void xfs_rmap_finish_one_cleanup(struct xfs_trans *tp,