Skip to content

L
linux
Commit a67d00a5 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files
Options

xfs: pass a struct xfs_bmbt_irec to xfs_bmbt_update 

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 79fa6143
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 116 deletions
fs/xfs/libxfs/xfs_bmap.c
View file @ a67d00a5
...@@ -160,21 +160,17 @@ static inline bool xfs_bmap_wants_extents(struct xfs_inode *ip, int whichfork) ...@@ -160,21 +160,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 * Update the record referred to by cur to the value given by irec
* by [off, bno, len, state].
* This either works (return 0) or gets an EFSCORRUPTED error. * This either works (return 0) or gets an EFSCORRUPTED error.
*/ */
STATIC int STATIC int
xfs_bmbt_update( xfs_bmbt_update(
struct xfs_btree_cur *cur, struct xfs_btree_cur *cur,
xfs_fileoff_t off, struct xfs_bmbt_irec *irec)
xfs_fsblock_t bno,
xfs_filblks_t len,
xfs_exntst_t state)
{ {
union xfs_btree_rec rec; 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); return xfs_btree_update(cur, &rec);
} }
...@@ -1715,9 +1711,7 @@ xfs_bmap_add_extent_delay_real( ...@@ -1715,9 +1711,7 @@ xfs_bmap_add_extent_delay_real(
if (error) if (error)
goto done; goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done); XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
error = xfs_bmbt_update(bma->cur, LEFT.br_startoff, error = xfs_bmbt_update(bma->cur, &LEFT);
LEFT.br_startblock,
LEFT.br_blockcount, LEFT.br_state);
if (error) if (error)
goto done; goto done;
} }
...@@ -1747,9 +1741,7 @@ xfs_bmap_add_extent_delay_real( ...@@ -1747,9 +1741,7 @@ xfs_bmap_add_extent_delay_real(
if (error) if (error)
goto done; goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done); XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
error = xfs_bmbt_update(bma->cur, LEFT.br_startoff, error = xfs_bmbt_update(bma->cur, &LEFT);
LEFT.br_startblock,
LEFT.br_blockcount, LEFT.br_state);
if (error) if (error)
goto done; goto done;
} }
...@@ -1777,9 +1769,7 @@ xfs_bmap_add_extent_delay_real( ...@@ -1777,9 +1769,7 @@ xfs_bmap_add_extent_delay_real(
if (error) if (error)
goto done; goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done); XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
error = xfs_bmbt_update(bma->cur, PREV.br_startoff, error = xfs_bmbt_update(bma->cur, &PREV);
PREV.br_startblock,
PREV.br_blockcount, PREV.br_state);
if (error) if (error)
goto done; goto done;
} }
...@@ -1848,9 +1838,7 @@ xfs_bmap_add_extent_delay_real( ...@@ -1848,9 +1838,7 @@ xfs_bmap_add_extent_delay_real(
if (error) if (error)
goto done; goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done); XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
error = xfs_bmbt_update(bma->cur, LEFT.br_startoff, error = xfs_bmbt_update(bma->cur, &LEFT);
LEFT.br_startblock, LEFT.br_blockcount,
LEFT.br_state);
if (error) if (error)
goto done; goto done;
} }
...@@ -1928,9 +1916,7 @@ xfs_bmap_add_extent_delay_real( ...@@ -1928,9 +1916,7 @@ xfs_bmap_add_extent_delay_real(
if (error) if (error)
goto done; goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done); XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
error = xfs_bmbt_update(bma->cur, RIGHT.br_startoff, error = xfs_bmbt_update(bma->cur, &RIGHT);
RIGHT.br_startblock, RIGHT.br_blockcount,
RIGHT.br_state);
if (error) if (error)
goto done; goto done;
} }
...@@ -2276,9 +2262,7 @@ xfs_bmap_add_extent_unwritten_real( ...@@ -2276,9 +2262,7 @@ xfs_bmap_add_extent_unwritten_real(
if ((error = xfs_btree_decrement(cur, 0, &i))) if ((error = xfs_btree_decrement(cur, 0, &i)))
goto done; goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done); XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
error = xfs_bmbt_update(cur, LEFT.br_startoff, error = xfs_bmbt_update(cur, &LEFT);
LEFT.br_startblock, LEFT.br_blockcount,
LEFT.br_state);
if (error) if (error)
goto done; goto done;
} }
...@@ -2314,9 +2298,7 @@ xfs_bmap_add_extent_unwritten_real( ...@@ -2314,9 +2298,7 @@ xfs_bmap_add_extent_unwritten_real(
if ((error = xfs_btree_decrement(cur, 0, &i))) if ((error = xfs_btree_decrement(cur, 0, &i)))
goto done; goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done); XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
error = xfs_bmbt_update(cur, LEFT.br_startoff, error = xfs_bmbt_update(cur, &LEFT);
LEFT.br_startblock, LEFT.br_blockcount,
LEFT.br_state);
if (error) if (error)
goto done; goto done;
} }
...@@ -2351,9 +2333,7 @@ xfs_bmap_add_extent_unwritten_real( ...@@ -2351,9 +2333,7 @@ xfs_bmap_add_extent_unwritten_real(
if ((error = xfs_btree_decrement(cur, 0, &i))) if ((error = xfs_btree_decrement(cur, 0, &i)))
goto done; goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done); XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
error = xfs_bmbt_update(cur, PREV.br_startoff, error = xfs_bmbt_update(cur, &PREV);
PREV.br_startblock, PREV.br_blockcount,
PREV.br_state);
if (error) if (error)
goto done; goto done;
} }
...@@ -2379,9 +2359,7 @@ xfs_bmap_add_extent_unwritten_real( ...@@ -2379,9 +2359,7 @@ xfs_bmap_add_extent_unwritten_real(
&i))) &i)))
goto done; goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done); XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
error = xfs_bmbt_update(cur, PREV.br_startoff, error = xfs_bmbt_update(cur, &PREV);
PREV.br_startblock, PREV.br_blockcount,
PREV.br_state);
if (error) if (error)
goto done; goto done;
} }
...@@ -2417,17 +2395,13 @@ xfs_bmap_add_extent_unwritten_real( ...@@ -2417,17 +2395,13 @@ xfs_bmap_add_extent_unwritten_real(
if (error) if (error)
goto done; goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done); XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
error = xfs_bmbt_update(cur, PREV.br_startoff, error = xfs_bmbt_update(cur, &PREV);
PREV.br_startblock, PREV.br_blockcount,
PREV.br_state);
if (error) if (error)
goto done; goto done;
error = xfs_btree_decrement(cur, 0, &i); error = xfs_btree_decrement(cur, 0, &i);
if (error) if (error)
goto done; goto done;
error = xfs_bmbt_update(cur, LEFT.br_startoff, error = xfs_bmbt_update(cur, &LEFT);
LEFT.br_startblock, LEFT.br_blockcount,
LEFT.br_state);
if (error) if (error)
goto done; goto done;
} }
...@@ -2459,9 +2433,7 @@ xfs_bmap_add_extent_unwritten_real( ...@@ -2459,9 +2433,7 @@ xfs_bmap_add_extent_unwritten_real(
if (error) if (error)
goto done; goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done); XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
error = xfs_bmbt_update(cur, PREV.br_startoff, error = xfs_bmbt_update(cur, &PREV);
PREV.br_startblock, PREV.br_blockcount,
PREV.br_state);
if (error) if (error)
goto done; goto done;
cur->bc_rec.b = *new; cur->bc_rec.b = *new;
...@@ -2501,17 +2473,13 @@ xfs_bmap_add_extent_unwritten_real( ...@@ -2501,17 +2473,13 @@ xfs_bmap_add_extent_unwritten_real(
if (error) if (error)
goto done; goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done); XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
error = xfs_bmbt_update(cur, PREV.br_startoff, error = xfs_bmbt_update(cur, &PREV);
PREV.br_startblock, PREV.br_blockcount,
PREV.br_state);
if (error) if (error)
goto done; goto done;
error = xfs_btree_increment(cur, 0, &i); error = xfs_btree_increment(cur, 0, &i);
if (error) if (error)
goto done; goto done;
error = xfs_bmbt_update(cur, RIGHT.br_startoff, error = xfs_bmbt_update(cur, &RIGHT);
RIGHT.br_startblock,
RIGHT.br_blockcount, RIGHT.br_state);
if (error) if (error)
goto done; goto done;
} }
...@@ -2543,9 +2511,7 @@ xfs_bmap_add_extent_unwritten_real( ...@@ -2543,9 +2511,7 @@ xfs_bmap_add_extent_unwritten_real(
if (error) if (error)
goto done; goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done); XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
error = xfs_bmbt_update(cur, PREV.br_startoff, error = xfs_bmbt_update(cur, &PREV);
PREV.br_startblock, PREV.br_blockcount,
PREV.br_state);
if (error) if (error)
goto done; goto done;
if ((error = xfs_bmbt_lookup_eq(cur, new->br_startoff, if ((error = xfs_bmbt_lookup_eq(cur, new->br_startoff,
...@@ -2595,9 +2561,8 @@ xfs_bmap_add_extent_unwritten_real( ...@@ -2595,9 +2561,8 @@ xfs_bmap_add_extent_unwritten_real(
goto done; goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done); XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
/* new right extent - oldext */ /* new right extent - oldext */
if ((error = xfs_bmbt_update(cur, r[1].br_startoff, error = xfs_bmbt_update(cur, &r[1]);
r[1].br_startblock, r[1].br_blockcount, if (error)
r[1].br_state)))
goto done; goto done;
/* new left extent - oldext */ /* new left extent - oldext */
cur->bc_rec.b = PREV; cur->bc_rec.b = PREV;
...@@ -2938,9 +2903,7 @@ xfs_bmap_add_extent_hole_real( ...@@ -2938,9 +2903,7 @@ xfs_bmap_add_extent_hole_real(
if (error) if (error)
goto done; goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done); XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
error = xfs_bmbt_update(cur, left.br_startoff, error = xfs_bmbt_update(cur, &left);
left.br_startblock,
left.br_blockcount, left.br_state);
if (error) if (error)
goto done; goto done;
} }
...@@ -2969,9 +2932,7 @@ xfs_bmap_add_extent_hole_real( ...@@ -2969,9 +2932,7 @@ xfs_bmap_add_extent_hole_real(
if (error) if (error)
goto done; goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done); XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
error = xfs_bmbt_update(cur, left.br_startoff, error = xfs_bmbt_update(cur, &left);
left.br_startblock,
left.br_blockcount, left.br_state);
if (error) if (error)
goto done; goto done;
} }
...@@ -3001,9 +2962,7 @@ xfs_bmap_add_extent_hole_real( ...@@ -3001,9 +2962,7 @@ xfs_bmap_add_extent_hole_real(
if (error) if (error)
goto done; goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done); XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
error = xfs_bmbt_update(cur, right.br_startoff, error = xfs_bmbt_update(cur, &right);
right.br_startblock,
right.br_blockcount, right.br_state);
if (error) if (error)
goto done; goto done;
} }
...@@ -5187,8 +5146,7 @@ xfs_bmap_del_extent_real( ...@@ -5187,8 +5146,7 @@ xfs_bmap_del_extent_real(
flags |= xfs_ilog_fext(whichfork); flags |= xfs_ilog_fext(whichfork);
break; break;
} }
error = xfs_bmbt_update(cur, got.br_startoff, got.br_startblock, error = xfs_bmbt_update(cur, &got);
got.br_blockcount, got.br_state);
if (error) if (error)
goto done; goto done;
break; break;
...@@ -5204,8 +5162,7 @@ xfs_bmap_del_extent_real( ...@@ -5204,8 +5162,7 @@ xfs_bmap_del_extent_real(
flags |= xfs_ilog_fext(whichfork); flags |= xfs_ilog_fext(whichfork);
break; break;
} }
error = xfs_bmbt_update(cur, got.br_startoff, got.br_startblock, error = xfs_bmbt_update(cur, &got);
got.br_blockcount, got.br_state);
if (error) if (error)
goto done; goto done;
break; break;
...@@ -5226,9 +5183,7 @@ xfs_bmap_del_extent_real( ...@@ -5226,9 +5183,7 @@ xfs_bmap_del_extent_real(
flags |= XFS_ILOG_CORE; flags |= XFS_ILOG_CORE;
if (cur) { if (cur) {
error = xfs_bmbt_update(cur, got.br_startoff, error = xfs_bmbt_update(cur, &got);
got.br_startblock, got.br_blockcount,
got.br_state);
if (error) if (error)
goto done; goto done;
error = xfs_btree_increment(cur, 0, &i); error = xfs_btree_increment(cur, 0, &i);
...@@ -5258,10 +5213,7 @@ xfs_bmap_del_extent_real( ...@@ -5258,10 +5213,7 @@ xfs_bmap_del_extent_real(
* Update the btree record back * Update the btree record back
* to the original value. * to the original value.
*/ */
error = xfs_bmbt_update(cur, old.br_startoff, error = xfs_bmbt_update(cur, &old);
old.br_startblock,
old.br_blockcount,
old.br_state);
if (error) if (error)
goto done; goto done;
/* /*
...@@ -5799,8 +5751,7 @@ xfs_bmse_merge( ...@@ -5799,8 +5751,7 @@ xfs_bmse_merge(
return error; return error;
XFS_WANT_CORRUPTED_RETURN(mp, i == 1); XFS_WANT_CORRUPTED_RETURN(mp, i == 1);
error = xfs_bmbt_update(cur, new.br_startoff, new.br_startblock, error = xfs_bmbt_update(cur, &new);
new.br_blockcount, new.br_state);
if (error) if (error)
return error; return error;
...@@ -5917,9 +5868,7 @@ xfs_bmse_shift_one( ...@@ -5917,9 +5868,7 @@ xfs_bmse_shift_one(
return error; return error;
XFS_WANT_CORRUPTED_RETURN(mp, i == 1); XFS_WANT_CORRUPTED_RETURN(mp, i == 1);
error = xfs_bmbt_update(cur, new.br_startoff, error = xfs_bmbt_update(cur, &new);
new.br_startblock, new.br_blockcount,
new.br_state);
if (error) if (error)
return error; return error;
} else { } else {
...@@ -6180,10 +6129,7 @@ xfs_bmap_split_extent_at( ...@@ -6180,10 +6129,7 @@ xfs_bmap_split_extent_at(
logflags = XFS_ILOG_CORE; logflags = XFS_ILOG_CORE;
if (cur) { if (cur) {
error = xfs_bmbt_update(cur, got.br_startoff, error = xfs_bmbt_update(cur, &got);
got.br_startblock,
got.br_blockcount,
got.br_state);
if (error) if (error)
goto del_cursor; goto del_cursor;
} else } else
......
fs/xfs/libxfs/xfs_bmap_btree.c
View file @ a67d00a5
...@@ -228,47 +228,31 @@ xfs_bmbt_set_all( ...@@ -228,47 +228,31 @@ xfs_bmbt_set_all(
s->br_blockcount, s->br_state); 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 void
xfs_bmbt_disk_set_allf( xfs_bmbt_disk_set_all(
xfs_bmbt_rec_t *r, struct xfs_bmbt_rec *r,
xfs_fileoff_t startoff, struct xfs_bmbt_irec *s)
xfs_fsblock_t startblock,
xfs_filblks_t blockcount,
xfs_exntst_t state)
{ {
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(s->br_state == XFS_EXT_NORM || s->br_state == XFS_EXT_UNWRITTEN);
ASSERT((startoff & xfs_mask64hi(64-BMBT_STARTOFF_BITLEN)) == 0); ASSERT(!(s->br_startoff & xfs_mask64hi(64-BMBT_STARTOFF_BITLEN)));
ASSERT((blockcount & xfs_mask64hi(64-BMBT_BLOCKCOUNT_BITLEN)) == 0); ASSERT(!(s->br_blockcount & xfs_mask64hi(64-BMBT_BLOCKCOUNT_BITLEN)));
ASSERT((startblock & xfs_mask64hi(64-BMBT_STARTBLOCK_BITLEN)) == 0); ASSERT(!(s->br_startblock & xfs_mask64hi(64-BMBT_STARTBLOCK_BITLEN)));
r->l0 = cpu_to_be64( r->l0 = cpu_to_be64(
((xfs_bmbt_rec_base_t)extent_flag << 63) | ((xfs_bmbt_rec_base_t)extent_flag << 63) |
((xfs_bmbt_rec_base_t)startoff << 9) | ((xfs_bmbt_rec_base_t)s->br_startoff << 9) |
((xfs_bmbt_rec_base_t)startblock >> 43)); ((xfs_bmbt_rec_base_t)s->br_startblock >> 43));
r->l1 = cpu_to_be64( r->l1 = cpu_to_be64(
((xfs_bmbt_rec_base_t)startblock << 21) | ((xfs_bmbt_rec_base_t)s->br_startblock << 21) |
((xfs_bmbt_rec_base_t)blockcount & ((xfs_bmbt_rec_base_t)s->br_blockcount &
(xfs_bmbt_rec_base_t)xfs_mask64lo(21))); (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. * Set the blockcount field in a bmap extent record.
*/ */
......
fs/xfs/libxfs/xfs_bmap_btree.h
View file @ a67d00a5
...@@ -104,6 +104,7 @@ extern xfs_fsblock_t xfs_bmbt_get_startblock(xfs_bmbt_rec_host_t *r); ...@@ -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_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); 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_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); 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); ...@@ -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_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_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, extern void xfs_bmbt_to_bmdr(struct xfs_mount *, struct xfs_btree_block *, int,
xfs_bmdr_block_t *, int); xfs_bmdr_block_t *, int);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7