From: Christoph Hellwig <hch@lst.de>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 14/18] xfs: pass a struct xfs_bmbt_irec to xfs_bmbt_update
Date: Fri, 15 Sep 2017 07:54:22 -0700 [thread overview]
Message-ID: <20170915145426.26194-15-hch@lst.de> (raw)
In-Reply-To: <20170915145426.26194-1-hch@lst.de>
Now that we've massaged the callers into the right form we can always
pass the actual extent record instead of the individual fields.
With that xfs_bmbt_disk_set_allf can go away, and xfs_bmbt_disk_set_all
can be merged into the former implementation of xfs_bmbt_disk_set_allf.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
---
fs/xfs/libxfs/xfs_bmap.c | 114 +++++++++++------------------------------
fs/xfs/libxfs/xfs_bmap_btree.c | 42 +++++----------
fs/xfs/libxfs/xfs_bmap_btree.h | 4 +-
3 files changed, 44 insertions(+), 116 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index 8bc3ee7d9edb..fb5e669f438d 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -161,21 +161,17 @@ static inline bool xfs_bmap_wants_extents(struct xfs_inode *ip, int whichfork)
}
/*
- * Update the record referred to by cur to the value given
- * by [off, bno, len, state].
+ * Update the record referred to by cur to the value given by irec
* This either works (return 0) or gets an EFSCORRUPTED error.
*/
STATIC int
xfs_bmbt_update(
struct xfs_btree_cur *cur,
- xfs_fileoff_t off,
- xfs_fsblock_t bno,
- xfs_filblks_t len,
- xfs_exntst_t state)
+ struct xfs_bmbt_irec *irec)
{
union xfs_btree_rec rec;
- xfs_bmbt_disk_set_allf(&rec.bmbt, off, bno, len, state);
+ xfs_bmbt_disk_set_all(&rec.bmbt, irec);
return xfs_btree_update(cur, &rec);
}
@@ -1729,9 +1725,7 @@ xfs_bmap_add_extent_delay_real(
if (error)
goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
- error = xfs_bmbt_update(bma->cur, LEFT.br_startoff,
- LEFT.br_startblock,
- LEFT.br_blockcount, LEFT.br_state);
+ error = xfs_bmbt_update(bma->cur, &LEFT);
if (error)
goto done;
}
@@ -1761,9 +1755,7 @@ xfs_bmap_add_extent_delay_real(
if (error)
goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
- error = xfs_bmbt_update(bma->cur, LEFT.br_startoff,
- LEFT.br_startblock,
- LEFT.br_blockcount, LEFT.br_state);
+ error = xfs_bmbt_update(bma->cur, &LEFT);
if (error)
goto done;
}
@@ -1791,9 +1783,7 @@ xfs_bmap_add_extent_delay_real(
if (error)
goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
- error = xfs_bmbt_update(bma->cur, PREV.br_startoff,
- PREV.br_startblock,
- PREV.br_blockcount, PREV.br_state);
+ error = xfs_bmbt_update(bma->cur, &PREV);
if (error)
goto done;
}
@@ -1862,9 +1852,7 @@ xfs_bmap_add_extent_delay_real(
if (error)
goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
- error = xfs_bmbt_update(bma->cur, LEFT.br_startoff,
- LEFT.br_startblock, LEFT.br_blockcount,
- LEFT.br_state);
+ error = xfs_bmbt_update(bma->cur, &LEFT);
if (error)
goto done;
}
@@ -1942,9 +1930,7 @@ xfs_bmap_add_extent_delay_real(
if (error)
goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
- error = xfs_bmbt_update(bma->cur, RIGHT.br_startoff,
- RIGHT.br_startblock, RIGHT.br_blockcount,
- RIGHT.br_state);
+ error = xfs_bmbt_update(bma->cur, &RIGHT);
if (error)
goto done;
}
@@ -2303,9 +2289,7 @@ xfs_bmap_add_extent_unwritten_real(
if ((error = xfs_btree_decrement(cur, 0, &i)))
goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
- error = xfs_bmbt_update(cur, LEFT.br_startoff,
- LEFT.br_startblock, LEFT.br_blockcount,
- LEFT.br_state);
+ error = xfs_bmbt_update(cur, &LEFT);
if (error)
goto done;
}
@@ -2341,9 +2325,7 @@ xfs_bmap_add_extent_unwritten_real(
if ((error = xfs_btree_decrement(cur, 0, &i)))
goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
- error = xfs_bmbt_update(cur, LEFT.br_startoff,
- LEFT.br_startblock, LEFT.br_blockcount,
- LEFT.br_state);
+ error = xfs_bmbt_update(cur, &LEFT);
if (error)
goto done;
}
@@ -2378,9 +2360,7 @@ xfs_bmap_add_extent_unwritten_real(
if ((error = xfs_btree_decrement(cur, 0, &i)))
goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
- error = xfs_bmbt_update(cur, PREV.br_startoff,
- PREV.br_startblock, PREV.br_blockcount,
- PREV.br_state);
+ error = xfs_bmbt_update(cur, &PREV);
if (error)
goto done;
}
@@ -2406,9 +2386,7 @@ xfs_bmap_add_extent_unwritten_real(
&i)))
goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
- error = xfs_bmbt_update(cur, PREV.br_startoff,
- PREV.br_startblock, PREV.br_blockcount,
- PREV.br_state);
+ error = xfs_bmbt_update(cur, &PREV);
if (error)
goto done;
}
@@ -2444,17 +2422,13 @@ xfs_bmap_add_extent_unwritten_real(
if (error)
goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
- error = xfs_bmbt_update(cur, PREV.br_startoff,
- PREV.br_startblock, PREV.br_blockcount,
- PREV.br_state);
+ error = xfs_bmbt_update(cur, &PREV);
if (error)
goto done;
error = xfs_btree_decrement(cur, 0, &i);
if (error)
goto done;
- error = xfs_bmbt_update(cur, LEFT.br_startoff,
- LEFT.br_startblock, LEFT.br_blockcount,
- LEFT.br_state);
+ error = xfs_bmbt_update(cur, &LEFT);
if (error)
goto done;
}
@@ -2486,9 +2460,7 @@ xfs_bmap_add_extent_unwritten_real(
if (error)
goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
- error = xfs_bmbt_update(cur, PREV.br_startoff,
- PREV.br_startblock, PREV.br_blockcount,
- PREV.br_state);
+ error = xfs_bmbt_update(cur, &PREV);
if (error)
goto done;
cur->bc_rec.b = *new;
@@ -2528,17 +2500,13 @@ xfs_bmap_add_extent_unwritten_real(
if (error)
goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
- error = xfs_bmbt_update(cur, PREV.br_startoff,
- PREV.br_startblock, PREV.br_blockcount,
- PREV.br_state);
+ error = xfs_bmbt_update(cur, &PREV);
if (error)
goto done;
error = xfs_btree_increment(cur, 0, &i);
if (error)
goto done;
- error = xfs_bmbt_update(cur, RIGHT.br_startoff,
- RIGHT.br_startblock,
- RIGHT.br_blockcount, RIGHT.br_state);
+ error = xfs_bmbt_update(cur, &RIGHT);
if (error)
goto done;
}
@@ -2570,9 +2538,7 @@ xfs_bmap_add_extent_unwritten_real(
if (error)
goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
- error = xfs_bmbt_update(cur, PREV.br_startoff,
- PREV.br_startblock, PREV.br_blockcount,
- PREV.br_state);
+ error = xfs_bmbt_update(cur, &PREV);
if (error)
goto done;
if ((error = xfs_bmbt_lookup_eq(cur, new->br_startoff,
@@ -2622,9 +2588,8 @@ xfs_bmap_add_extent_unwritten_real(
goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
/* new right extent - oldext */
- if ((error = xfs_bmbt_update(cur, r[1].br_startoff,
- r[1].br_startblock, r[1].br_blockcount,
- r[1].br_state)))
+ error = xfs_bmbt_update(cur, &r[1]);
+ if (error)
goto done;
/* new left extent - oldext */
cur->bc_rec.b = PREV;
@@ -2965,9 +2930,7 @@ xfs_bmap_add_extent_hole_real(
if (error)
goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
- error = xfs_bmbt_update(cur, left.br_startoff,
- left.br_startblock,
- left.br_blockcount, left.br_state);
+ error = xfs_bmbt_update(cur, &left);
if (error)
goto done;
}
@@ -2996,9 +2959,7 @@ xfs_bmap_add_extent_hole_real(
if (error)
goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
- error = xfs_bmbt_update(cur, left.br_startoff,
- left.br_startblock,
- left.br_blockcount, left.br_state);
+ error = xfs_bmbt_update(cur, &left);
if (error)
goto done;
}
@@ -3028,9 +2989,7 @@ xfs_bmap_add_extent_hole_real(
if (error)
goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
- error = xfs_bmbt_update(cur, right.br_startoff,
- right.br_startblock,
- right.br_blockcount, right.br_state);
+ error = xfs_bmbt_update(cur, &right);
if (error)
goto done;
}
@@ -5203,8 +5162,7 @@ xfs_bmap_del_extent_real(
flags |= xfs_ilog_fext(whichfork);
break;
}
- error = xfs_bmbt_update(cur, got.br_startoff, got.br_startblock,
- got.br_blockcount, got.br_state);
+ error = xfs_bmbt_update(cur, &got);
if (error)
goto done;
break;
@@ -5220,8 +5178,7 @@ xfs_bmap_del_extent_real(
flags |= xfs_ilog_fext(whichfork);
break;
}
- error = xfs_bmbt_update(cur, got.br_startoff, got.br_startblock,
- got.br_blockcount, got.br_state);
+ error = xfs_bmbt_update(cur, &got);
if (error)
goto done;
break;
@@ -5242,9 +5199,7 @@ xfs_bmap_del_extent_real(
flags |= XFS_ILOG_CORE;
if (cur) {
- error = xfs_bmbt_update(cur, got.br_startoff,
- got.br_startblock, got.br_blockcount,
- got.br_state);
+ error = xfs_bmbt_update(cur, &got);
if (error)
goto done;
error = xfs_btree_increment(cur, 0, &i);
@@ -5274,10 +5229,7 @@ xfs_bmap_del_extent_real(
* Update the btree record back
* to the original value.
*/
- error = xfs_bmbt_update(cur, old.br_startoff,
- old.br_startblock,
- old.br_blockcount,
- old.br_state);
+ error = xfs_bmbt_update(cur, &old);
if (error)
goto done;
/*
@@ -5815,8 +5767,7 @@ xfs_bmse_merge(
return error;
XFS_WANT_CORRUPTED_RETURN(mp, i == 1);
- error = xfs_bmbt_update(cur, new.br_startoff, new.br_startblock,
- new.br_blockcount, new.br_state);
+ error = xfs_bmbt_update(cur, &new);
if (error)
return error;
@@ -5933,9 +5884,7 @@ xfs_bmse_shift_one(
return error;
XFS_WANT_CORRUPTED_RETURN(mp, i == 1);
- error = xfs_bmbt_update(cur, new.br_startoff,
- new.br_startblock, new.br_blockcount,
- new.br_state);
+ error = xfs_bmbt_update(cur, &new);
if (error)
return error;
} else {
@@ -6196,10 +6145,7 @@ xfs_bmap_split_extent_at(
logflags = XFS_ILOG_CORE;
if (cur) {
- error = xfs_bmbt_update(cur, got.br_startoff,
- got.br_startblock,
- got.br_blockcount,
- got.br_state);
+ error = xfs_bmbt_update(cur, &got);
if (error)
goto del_cursor;
} else
diff --git a/fs/xfs/libxfs/xfs_bmap_btree.c b/fs/xfs/libxfs/xfs_bmap_btree.c
index a6331ffa51e3..7e2d981626ef 100644
--- a/fs/xfs/libxfs/xfs_bmap_btree.c
+++ b/fs/xfs/libxfs/xfs_bmap_btree.c
@@ -228,47 +228,31 @@ xfs_bmbt_set_all(
s->br_blockcount, s->br_state);
}
-
/*
- * Set all the fields in a disk format bmap extent record from the arguments.
+ * Set all the fields in a bmap extent record from the uncompressed form.
*/
void
-xfs_bmbt_disk_set_allf(
- xfs_bmbt_rec_t *r,
- xfs_fileoff_t startoff,
- xfs_fsblock_t startblock,
- xfs_filblks_t blockcount,
- xfs_exntst_t state)
+xfs_bmbt_disk_set_all(
+ struct xfs_bmbt_rec *r,
+ struct xfs_bmbt_irec *s)
{
- int extent_flag = (state == XFS_EXT_NORM) ? 0 : 1;
+ int extent_flag = (s->br_state != XFS_EXT_NORM);
- ASSERT(state == XFS_EXT_NORM || state == XFS_EXT_UNWRITTEN);
- ASSERT((startoff & xfs_mask64hi(64-BMBT_STARTOFF_BITLEN)) == 0);
- ASSERT((blockcount & xfs_mask64hi(64-BMBT_BLOCKCOUNT_BITLEN)) == 0);
- ASSERT((startblock & xfs_mask64hi(64-BMBT_STARTBLOCK_BITLEN)) == 0);
+ ASSERT(s->br_state == XFS_EXT_NORM || s->br_state == XFS_EXT_UNWRITTEN);
+ ASSERT(!(s->br_startoff & xfs_mask64hi(64-BMBT_STARTOFF_BITLEN)));
+ ASSERT(!(s->br_blockcount & xfs_mask64hi(64-BMBT_BLOCKCOUNT_BITLEN)));
+ ASSERT(!(s->br_startblock & xfs_mask64hi(64-BMBT_STARTBLOCK_BITLEN)));
r->l0 = cpu_to_be64(
((xfs_bmbt_rec_base_t)extent_flag << 63) |
- ((xfs_bmbt_rec_base_t)startoff << 9) |
- ((xfs_bmbt_rec_base_t)startblock >> 43));
+ ((xfs_bmbt_rec_base_t)s->br_startoff << 9) |
+ ((xfs_bmbt_rec_base_t)s->br_startblock >> 43));
r->l1 = cpu_to_be64(
- ((xfs_bmbt_rec_base_t)startblock << 21) |
- ((xfs_bmbt_rec_base_t)blockcount &
+ ((xfs_bmbt_rec_base_t)s->br_startblock << 21) |
+ ((xfs_bmbt_rec_base_t)s->br_blockcount &
(xfs_bmbt_rec_base_t)xfs_mask64lo(21)));
}
-/*
- * Set all the fields in a bmap extent record from the uncompressed form.
- */
-STATIC void
-xfs_bmbt_disk_set_all(
- xfs_bmbt_rec_t *r,
- xfs_bmbt_irec_t *s)
-{
- xfs_bmbt_disk_set_allf(r, s->br_startoff, s->br_startblock,
- s->br_blockcount, s->br_state);
-}
-
/*
* Set the blockcount field in a bmap extent record.
*/
diff --git a/fs/xfs/libxfs/xfs_bmap_btree.h b/fs/xfs/libxfs/xfs_bmap_btree.h
index 9da5a8d4f184..bd3c56f1cd03 100644
--- a/fs/xfs/libxfs/xfs_bmap_btree.h
+++ b/fs/xfs/libxfs/xfs_bmap_btree.h
@@ -104,6 +104,7 @@ extern xfs_fsblock_t xfs_bmbt_get_startblock(xfs_bmbt_rec_host_t *r);
extern xfs_fileoff_t xfs_bmbt_get_startoff(xfs_bmbt_rec_host_t *r);
extern xfs_exntst_t xfs_bmbt_get_state(xfs_bmbt_rec_host_t *r);
+void xfs_bmbt_disk_set_all(struct xfs_bmbt_rec *r, struct xfs_bmbt_irec *s);
extern xfs_filblks_t xfs_bmbt_disk_get_blockcount(xfs_bmbt_rec_t *r);
extern xfs_fileoff_t xfs_bmbt_disk_get_startoff(xfs_bmbt_rec_t *r);
@@ -115,9 +116,6 @@ extern void xfs_bmbt_set_startblock(xfs_bmbt_rec_host_t *r, xfs_fsblock_t v);
extern void xfs_bmbt_set_startoff(xfs_bmbt_rec_host_t *r, xfs_fileoff_t v);
extern void xfs_bmbt_set_state(xfs_bmbt_rec_host_t *r, xfs_exntst_t v);
-extern void xfs_bmbt_disk_set_allf(xfs_bmbt_rec_t *r, xfs_fileoff_t o,
- xfs_fsblock_t b, xfs_filblks_t c, xfs_exntst_t v);
-
extern void xfs_bmbt_to_bmdr(struct xfs_mount *, struct xfs_btree_block *, int,
xfs_bmdr_block_t *, int);
--
2.14.1
next prev parent reply other threads:[~2017-09-15 14:54 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-15 14:54 refactor extent manipulation V2 Christoph Hellwig
2017-09-15 14:54 ` [PATCH 01/18] xfs: fix incorrect extent state in xfs_bmap_add_extent_unwritten_real Christoph Hellwig
2017-09-15 14:54 ` [PATCH 02/18] xfs: use xfs_iext_get_extent instead of open coding it Christoph Hellwig
2017-09-15 14:54 ` [PATCH 03/18] xfs: don't set XFS_BTCUR_BPRV_WASDEL in xfs_bunmapi Christoph Hellwig
2017-09-15 14:54 ` [PATCH 04/18] xfs: rename bno to end in __xfs_bunmapi Christoph Hellwig
2017-09-15 14:54 ` [PATCH 05/18] xfs: use xfs_bmap_del_extent_delay for the data fork as well Christoph Hellwig
2017-09-15 14:54 ` [PATCH 06/18] xfs: move some more code into xfs_bmap_del_extent_real Christoph Hellwig
2017-09-15 14:54 ` [PATCH 07/18] xfs: use correct state defines in xfs_bmap_del_extent_{cow,delay} Christoph Hellwig
2017-09-15 16:59 ` Brian Foster
2017-09-15 14:54 ` [PATCH 08/18] xfs: use the state defines in xfs_bmap_del_extent_real Christoph Hellwig
2017-09-15 16:59 ` Brian Foster
2017-09-15 14:54 ` [PATCH 09/18] xfs: refactor xfs_del_extent_real Christoph Hellwig
2017-09-15 14:54 ` [PATCH 10/18] xfs: refactor xfs_bmap_add_extent_hole_delay Christoph Hellwig
2017-09-15 14:54 ` [PATCH 11/18] xfs: refactor xfs_bmap_add_extent_hole_real Christoph Hellwig
2017-09-15 14:54 ` [PATCH 12/18] xfs: refactor xfs_bmap_add_extent_delay_real Christoph Hellwig
2017-09-15 17:00 ` Brian Foster
2017-09-17 21:22 ` Christoph Hellwig
2017-09-15 14:54 ` [PATCH 13/18] xfs: refactor xfs_bmap_add_extent_unwritten_real Christoph Hellwig
2017-09-15 14:54 ` Christoph Hellwig [this message]
2017-09-15 14:54 ` [PATCH 15/18] xfs: pass a struct xfs_bmbt_irec to xfs_bmbt_lookup_eq Christoph Hellwig
2017-09-15 14:54 ` [PATCH 16/18] xfs: replace xfs_bmbt_lookup_ge with xfs_bmbt_lookup_first Christoph Hellwig
2017-09-15 14:54 ` [PATCH 17/18] xfs: remove all xfs_bmbt_set_* helpers except for xfs_bmbt_set_all Christoph Hellwig
2017-09-15 14:54 ` [PATCH 18/18] xfs: remove xfs_bmbt_get_state Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170915145426.26194-15-hch@lst.de \
--to=hch@lst.de \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).