From: Darrick J. Wong <djwong@xxxxxxxxxx>
Create an explicit helper function to log parts of rt bitmap blocks.
While we're at it, fix an off-by-one error in two of the the rtbitmap
logging calls that led to unnecessarily large log items but was
otherwise benign.
Suggested-by: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
---
fs/xfs/libxfs/xfs_rtbitmap.c | 49 +++++++++++++++++++++++++++++-------------
1 file changed, 34 insertions(+), 15 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_rtbitmap.c b/fs/xfs/libxfs/xfs_rtbitmap.c
index aefa2b0747a5..d05bd0218885 100644
--- a/fs/xfs/libxfs/xfs_rtbitmap.c
+++ b/fs/xfs/libxfs/xfs_rtbitmap.c
@@ -432,6 +432,18 @@ xfs_rtfind_forw(
return 0;
}
+/* Log rtsummary counter at @infoword. */
+static inline void
+xfs_trans_log_rtsummary(
+ struct xfs_trans *tp,
+ struct xfs_buf *bp,
+ unsigned int infoword)
+{
+ xfs_trans_log_buf(tp, bp,
+ infoword * sizeof(xfs_suminfo_t),
+ (infoword + 1) * sizeof(xfs_suminfo_t) - 1);
+}
+
/*
* Read and/or modify the summary information for a given extent size,
* bitmap block combination.
@@ -497,8 +509,6 @@ xfs_rtmodify_summary_int(
infoword = xfs_rtsumoffs_to_infoword(mp, so);
sp = xfs_rsumblock_infoptr(bp, infoword);
if (delta) {
- uint first = (uint)((char *)sp - (char *)bp->b_addr);
-
*sp += delta;
if (mp->m_rsum_cache) {
if (*sp == 0 && log == mp->m_rsum_cache[bbno])
@@ -506,7 +516,7 @@ xfs_rtmodify_summary_int(
if (*sp != 0 && log < mp->m_rsum_cache[bbno])
mp->m_rsum_cache[bbno] = log;
}
- xfs_trans_log_buf(tp, bp, first, first + sizeof(*sp) - 1);
+ xfs_trans_log_rtsummary(tp, bp, infoword);
}
if (sum)
*sum = *sp;
@@ -527,6 +537,19 @@ xfs_rtmodify_summary(
delta, rbpp, rsb, NULL);
}
+/* Log rtbitmap block from the word @from to the byte before @next. */
+static inline void
+xfs_trans_log_rtbitmap(
+ struct xfs_trans *tp,
+ struct xfs_buf *bp,
+ unsigned int from,
+ unsigned int next)
+{
+ xfs_trans_log_buf(tp, bp,
+ from * sizeof(xfs_rtword_t),
+ next * sizeof(xfs_rtword_t) - 1);
+}
+
/*
* Set the given range of bitmap bits to the given value.
* Do whatever I/O and logging is required.
@@ -548,6 +571,7 @@ xfs_rtmodify_range(
int i; /* current bit number rel. to start */
int lastbit; /* last useful bit in word */
xfs_rtword_t mask; /* mask o frelevant bits for value */
+ unsigned int firstword; /* first word used in the buffer */
unsigned int word; /* word number in the buffer */
/*
@@ -565,7 +589,7 @@ xfs_rtmodify_range(
/*
* Compute the starting word's address, and starting bit.
*/
- word = xfs_rtx_to_rbmword(mp, start);
+ firstword = word = xfs_rtx_to_rbmword(mp, start);
first = b = xfs_rbmblock_wordptr(bp, word);
bit = (int)(start & (XFS_NBWORD - 1));
/*
@@ -599,15 +623,13 @@ xfs_rtmodify_range(
* Log the changed part of this block.
* Get the next one.
*/
- xfs_trans_log_buf(tp, bp,
- (uint)((char *)first - (char *)bp->b_addr),
- (uint)((char *)b - (char *)bp->b_addr));
+ xfs_trans_log_rtbitmap(tp, bp, firstword, word);
error = xfs_rtbuf_get(mp, tp, ++block, 0, &bp);
if (error) {
return error;
}
- word = 0;
+ firstword = word = 0;
first = b = xfs_rbmblock_wordptr(bp, word);
} else {
/*
@@ -640,15 +662,13 @@ xfs_rtmodify_range(
* Log the changed part of this block.
* Get the next one.
*/
- xfs_trans_log_buf(tp, bp,
- (uint)((char *)first - (char *)bp->b_addr),
- (uint)((char *)b - (char *)bp->b_addr));
+ xfs_trans_log_rtbitmap(tp, bp, firstword, word);
error = xfs_rtbuf_get(mp, tp, ++block, 0, &bp);
if (error) {
return error;
}
- word = 0;
+ firstword = word = 0;
first = b = xfs_rbmblock_wordptr(bp, word);
} else {
/*
@@ -673,15 +693,14 @@ xfs_rtmodify_range(
*b |= mask;
else
*b &= ~mask;
+ word++;
b++;
}
/*
* Log any remaining changed bytes.
*/
if (b > first)
- xfs_trans_log_buf(tp, bp,
- (uint)((char *)first - (char *)bp->b_addr),
- (uint)((char *)b - (char *)bp->b_addr - 1));
+ xfs_trans_log_rtbitmap(tp, bp, firstword, word);
return 0;
}
