xfs: combine xfs_rtmodify_summary and xfs_rtget_summary

xfs_rtmodify_summary and xfs_rtget_summary are almost identical;
fold them into xfs_rtmodify_summary_int(), with wrappers for each of
the original calls.

The _int function modifies if a delta is passed, and returns a
summary pointer if *sum is passed.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

1 files changed, 37 insertions, 8 deletions

diff --git a/fs/xfs/libxfs/xfs_rtbitmap.c b/fs/xfs/libxfs/xfs_rtbitmap.c
index f4dd697cac08..50e3b9302722 100644
--- a/fs/xfs/libxfs/xfs_rtbitmap.c
+++ b/fs/xfs/libxfs/xfs_rtbitmap.c
@@ -424,20 +424,24 @@ xfs_rtfind_forw(
 }
 
 /*
- * Read and modify the summary information for a given extent size,
+ * Read and/or modify the summary information for a given extent size,
  * bitmap block combination.
  * Keeps track of a current summary block, so we don't keep reading
  * it from the buffer cache.
+ *
+ * Summary information is returned in *sum if specified.
+ * If no delta is specified, returns summary only.
  */
 int
-xfs_rtmodify_summary(
-        xfs_mount_t     *mp,            /* file system mount point */
+xfs_rtmodify_summary_int(
+        xfs_mount_t     *mp,            /* file system mount structure */
         xfs_trans_t     *tp,            /* transaction pointer */
         int             log,            /* log2 of extent size */
         xfs_rtblock_t   bbno,           /* bitmap block number */
         int             delta,          /* change to make to summary info */
         xfs_buf_t       **rbpp,         /* in/out: summary block buffer */
-        xfs_fsblock_t   *rsb)           /* in/out: summary block number */
+        xfs_fsblock_t   *rsb,           /* in/out: summary block number */
+        xfs_suminfo_t   *sum)           /* out: summary info for this block */
 {
         xfs_buf_t       *bp;            /* buffer for the summary block */
         int             error;          /* error value */
@@ -480,15 +484,40 @@ xfs_rtmodify_summary(
                 }
         }
         /*
-         * Point to the summary information, modify and log it.
+         * Point to the summary information, modify/log it, and/or copy it out.
          */
         sp = XFS_SUMPTR(mp, bp, so);
-        *sp += delta;
-        xfs_trans_log_buf(tp, bp, (uint)((char *)sp - (char *)bp->b_addr),
-                (uint)((char *)sp - (char *)bp->b_addr + sizeof(*sp) - 1));
+        if (delta) {
+                uint first = (uint)((char *)sp - (char *)bp->b_addr);
+
+                *sp += delta;
+                xfs_trans_log_buf(tp, bp, first, first + sizeof(*sp) - 1);
+        }
+        if (sum) {
+                /*
+                 * Drop the buffer if we're not asked to remember it.
+                 */
+                if (!rbpp)
+                        xfs_trans_brelse(tp, bp);
+                *sum = *sp;
+        }
         return 0;
 }
 
+int
+xfs_rtmodify_summary(
+        xfs_mount_t     *mp,            /* file system mount structure */
+        xfs_trans_t     *tp,            /* transaction pointer */
+        int             log,            /* log2 of extent size */
+        xfs_rtblock_t   bbno,           /* bitmap block number */
+        int             delta,          /* change to make to summary info */
+        xfs_buf_t       **rbpp,         /* in/out: summary block buffer */
+        xfs_fsblock_t   *rsb)           /* in/out: summary block number */
+{
+        return xfs_rtmodify_summary_int(mp, tp, log, bbno,
+                                        delta, rbpp, rsb, NULL);
+}
+
 /*
  * Set the given range of bitmap bits to the given value.
  * Do whatever I/O and logging is required.