mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
xfs: remove xfs_bmse_shift_one
Instead do the actual left and right shift work in the callers, and just keep a helper to update the bmap and rmap btrees as well as the in-core extent list. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
Christoph Hellwig
Darrick J. Wong
parent
ecfea3f0c8
commit
bf8062800a
2 changed files with 71 additions and 115 deletions
|
|
@ -5579,94 +5579,21 @@ xfs_bmse_merge(
|
|||
return xfs_rmap_map_extent(mp, dfops, ip, whichfork, &new);
|
||||
}
|
||||
|
||||
/*
|
||||
* Shift a single extent.
|
||||
*/
|
||||
STATIC int
|
||||
xfs_bmse_shift_one(
|
||||
struct xfs_inode *ip,
|
||||
int whichfork,
|
||||
xfs_fileoff_t offset_shift_fsb,
|
||||
int *current_ext,
|
||||
struct xfs_bmbt_irec *got,
|
||||
struct xfs_btree_cur *cur,
|
||||
int *logflags,
|
||||
enum shift_direction direction,
|
||||
struct xfs_defer_ops *dfops)
|
||||
static int
|
||||
xfs_bmap_shift_update_extent(
|
||||
struct xfs_inode *ip,
|
||||
int whichfork,
|
||||
xfs_extnum_t idx,
|
||||
struct xfs_bmbt_irec *got,
|
||||
struct xfs_btree_cur *cur,
|
||||
int *logflags,
|
||||
struct xfs_defer_ops *dfops,
|
||||
xfs_fileoff_t startoff)
|
||||
{
|
||||
struct xfs_ifork *ifp;
|
||||
struct xfs_mount *mp;
|
||||
xfs_fileoff_t startoff;
|
||||
struct xfs_bmbt_irec adj_irec, new;
|
||||
int error;
|
||||
int i;
|
||||
int total_extents;
|
||||
struct xfs_mount *mp = ip->i_mount;
|
||||
struct xfs_bmbt_irec new;
|
||||
int error, i;
|
||||
|
||||
mp = ip->i_mount;
|
||||
ifp = XFS_IFORK_PTR(ip, whichfork);
|
||||
total_extents = xfs_iext_count(ifp);
|
||||
|
||||
/* delalloc extents should be prevented by caller */
|
||||
XFS_WANT_CORRUPTED_RETURN(mp, !isnullstartblock(got->br_startblock));
|
||||
|
||||
if (direction == SHIFT_LEFT) {
|
||||
startoff = got->br_startoff - offset_shift_fsb;
|
||||
|
||||
/*
|
||||
* Check for merge if we've got an extent to the left,
|
||||
* otherwise make sure there's enough room at the start
|
||||
* of the file for the shift.
|
||||
*/
|
||||
if (!*current_ext) {
|
||||
if (got->br_startoff < offset_shift_fsb)
|
||||
return -EINVAL;
|
||||
goto update_current_ext;
|
||||
}
|
||||
|
||||
/*
|
||||
* grab the left extent and check for a large enough hole.
|
||||
*/
|
||||
xfs_iext_get_extent(ifp, *current_ext - 1, &adj_irec);
|
||||
if (startoff < adj_irec.br_startoff + adj_irec.br_blockcount)
|
||||
return -EINVAL;
|
||||
|
||||
/* check whether to merge the extent or shift it down */
|
||||
if (xfs_bmse_can_merge(&adj_irec, got, offset_shift_fsb)) {
|
||||
return xfs_bmse_merge(ip, whichfork, offset_shift_fsb,
|
||||
*current_ext, got, &adj_irec,
|
||||
cur, logflags, dfops);
|
||||
}
|
||||
} else {
|
||||
startoff = got->br_startoff + offset_shift_fsb;
|
||||
/* nothing to move if this is the last extent */
|
||||
if (*current_ext >= (total_extents - 1))
|
||||
goto update_current_ext;
|
||||
|
||||
/*
|
||||
* If this is not the last extent in the file, make sure there
|
||||
* is enough room between current extent and next extent for
|
||||
* accommodating the shift.
|
||||
*/
|
||||
xfs_iext_get_extent(ifp, *current_ext + 1, &adj_irec);
|
||||
if (startoff + got->br_blockcount > adj_irec.br_startoff)
|
||||
return -EINVAL;
|
||||
|
||||
/*
|
||||
* Unlike a left shift (which involves a hole punch),
|
||||
* a right shift does not modify extent neighbors
|
||||
* in any way. We should never find mergeable extents
|
||||
* in this scenario. Check anyways and warn if we
|
||||
* encounter two extents that could be one.
|
||||
*/
|
||||
if (xfs_bmse_can_merge(got, &adj_irec, offset_shift_fsb))
|
||||
WARN_ON_ONCE(1);
|
||||
}
|
||||
|
||||
/*
|
||||
* Increment the extent index for the next iteration, update the start
|
||||
* offset of the in-core extent and update the btree if applicable.
|
||||
*/
|
||||
update_current_ext:
|
||||
*logflags |= XFS_ILOG_CORE;
|
||||
|
||||
new = *got;
|
||||
|
|
@ -5685,13 +5612,8 @@ xfs_bmse_shift_one(
|
|||
*logflags |= XFS_ILOG_DEXT;
|
||||
}
|
||||
|
||||
xfs_iext_update_extent(ip, xfs_bmap_fork_to_state(whichfork),
|
||||
*current_ext, &new);
|
||||
|
||||
if (direction == SHIFT_LEFT)
|
||||
(*current_ext)++;
|
||||
else
|
||||
(*current_ext)--;
|
||||
xfs_iext_update_extent(ip, xfs_bmap_fork_to_state(whichfork), idx,
|
||||
&new);
|
||||
|
||||
/* update reverse mapping */
|
||||
error = xfs_rmap_unmap_extent(mp, dfops, ip, whichfork, got);
|
||||
|
|
@ -5715,10 +5637,11 @@ xfs_bmap_collapse_extents(
|
|||
struct xfs_mount *mp = ip->i_mount;
|
||||
struct xfs_ifork *ifp = XFS_IFORK_PTR(ip, whichfork);
|
||||
struct xfs_btree_cur *cur = NULL;
|
||||
struct xfs_bmbt_irec got;
|
||||
struct xfs_bmbt_irec got, prev;
|
||||
xfs_extnum_t current_ext;
|
||||
xfs_extnum_t total_extents;
|
||||
xfs_extnum_t stop_extent;
|
||||
xfs_fileoff_t new_startoff;
|
||||
int error = 0;
|
||||
int logflags = 0;
|
||||
|
||||
|
|
@ -5771,6 +5694,7 @@ xfs_bmap_collapse_extents(
|
|||
*done = true;
|
||||
goto del_cursor;
|
||||
}
|
||||
XFS_WANT_CORRUPTED_RETURN(mp, !isnullstartblock(got.br_startblock));
|
||||
|
||||
stop_extent = total_extents;
|
||||
if (current_ext >= stop_extent) {
|
||||
|
|
@ -5778,11 +5702,36 @@ xfs_bmap_collapse_extents(
|
|||
goto del_cursor;
|
||||
}
|
||||
|
||||
error = xfs_bmse_shift_one(ip, whichfork, offset_shift_fsb,
|
||||
¤t_ext, &got, cur, &logflags,
|
||||
SHIFT_LEFT, dfops);
|
||||
new_startoff = got.br_startoff - offset_shift_fsb;
|
||||
if (current_ext) {
|
||||
xfs_iext_get_extent(ifp, current_ext - 1, &prev);
|
||||
if (new_startoff < prev.br_startoff + prev.br_blockcount) {
|
||||
error = -EINVAL;
|
||||
goto del_cursor;
|
||||
}
|
||||
|
||||
/* check whether to merge the extent or shift it down */
|
||||
if (xfs_bmse_can_merge(&prev, &got, offset_shift_fsb)) {
|
||||
error = xfs_bmse_merge(ip, whichfork, offset_shift_fsb,
|
||||
current_ext, &got, &prev, cur,
|
||||
&logflags, dfops);
|
||||
if (error)
|
||||
goto del_cursor;
|
||||
goto done;
|
||||
}
|
||||
} else {
|
||||
if (got.br_startoff < offset_shift_fsb) {
|
||||
error = -EINVAL;
|
||||
goto del_cursor;
|
||||
}
|
||||
}
|
||||
|
||||
error = xfs_bmap_shift_update_extent(ip, whichfork, current_ext, &got,
|
||||
cur, &logflags, dfops, new_startoff);
|
||||
if (error)
|
||||
goto del_cursor;
|
||||
current_ext++;
|
||||
done:
|
||||
/*
|
||||
* If there was an extent merge during the shift, the extent
|
||||
* count can change. Update the total and grade the next record.
|
||||
|
|
@ -5795,17 +5744,13 @@ xfs_bmap_collapse_extents(
|
|||
}
|
||||
xfs_iext_get_extent(ifp, current_ext, &got);
|
||||
|
||||
if (!*done)
|
||||
*next_fsb = got.br_startoff;
|
||||
|
||||
*next_fsb = got.br_startoff;
|
||||
del_cursor:
|
||||
if (cur)
|
||||
xfs_btree_del_cursor(cur,
|
||||
error ? XFS_BTREE_ERROR : XFS_BTREE_NOERROR);
|
||||
|
||||
if (logflags)
|
||||
xfs_trans_log_inode(tp, ip, logflags);
|
||||
|
||||
return error;
|
||||
}
|
||||
|
||||
|
|
@ -5824,10 +5769,11 @@ xfs_bmap_insert_extents(
|
|||
struct xfs_mount *mp = ip->i_mount;
|
||||
struct xfs_ifork *ifp = XFS_IFORK_PTR(ip, whichfork);
|
||||
struct xfs_btree_cur *cur = NULL;
|
||||
struct xfs_bmbt_irec got, s;
|
||||
struct xfs_bmbt_irec got, next, s;
|
||||
xfs_extnum_t current_ext;
|
||||
xfs_extnum_t total_extents;
|
||||
xfs_extnum_t stop_extent;
|
||||
xfs_fileoff_t new_startoff;
|
||||
int error = 0;
|
||||
int logflags = 0;
|
||||
|
||||
|
|
@ -5894,6 +5840,7 @@ xfs_bmap_insert_extents(
|
|||
goto del_cursor;
|
||||
}
|
||||
}
|
||||
XFS_WANT_CORRUPTED_RETURN(mp, !isnullstartblock(got.br_startblock));
|
||||
|
||||
/* Lookup the extent index at which we have to stop */
|
||||
xfs_iext_lookup_extent(ip, ifp, stop_fsb, &stop_extent, &s);
|
||||
|
|
@ -5904,27 +5851,41 @@ xfs_bmap_insert_extents(
|
|||
goto del_cursor;
|
||||
}
|
||||
|
||||
error = xfs_bmse_shift_one(ip, whichfork, offset_shift_fsb,
|
||||
¤t_ext, &got, cur, &logflags,
|
||||
SHIFT_RIGHT, dfops);
|
||||
new_startoff = got.br_startoff + offset_shift_fsb;
|
||||
if (current_ext < total_extents - 1) {
|
||||
xfs_iext_get_extent(ifp, current_ext + 1, &next);
|
||||
if (new_startoff + got.br_blockcount > next.br_startoff) {
|
||||
error = -EINVAL;
|
||||
goto del_cursor;
|
||||
}
|
||||
|
||||
/*
|
||||
* Unlike a left shift (which involves a hole punch), a right
|
||||
* shift does not modify extent neighbors in any way. We should
|
||||
* never find mergeable extents in this scenario. Check anyways
|
||||
* and warn if we encounter two extents that could be one.
|
||||
*/
|
||||
if (xfs_bmse_can_merge(&got, &next, offset_shift_fsb))
|
||||
WARN_ON_ONCE(1);
|
||||
}
|
||||
|
||||
error = xfs_bmap_shift_update_extent(ip, whichfork, current_ext, &got,
|
||||
cur, &logflags, dfops, new_startoff);
|
||||
if (error)
|
||||
goto del_cursor;
|
||||
if (current_ext == stop_extent) {
|
||||
if (--current_ext == stop_extent) {
|
||||
*done = true;
|
||||
goto del_cursor;
|
||||
}
|
||||
xfs_iext_get_extent(ifp, current_ext, &got);
|
||||
|
||||
*next_fsb = got.br_startoff;
|
||||
|
||||
del_cursor:
|
||||
if (cur)
|
||||
xfs_btree_del_cursor(cur,
|
||||
error ? XFS_BTREE_ERROR : XFS_BTREE_NOERROR);
|
||||
|
||||
if (logflags)
|
||||
xfs_trans_log_inode(tp, ip, logflags);
|
||||
|
||||
return error;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -183,11 +183,6 @@ static inline bool xfs_bmap_is_real_extent(struct xfs_bmbt_irec *irec)
|
|||
!isnullstartblock(irec->br_startblock);
|
||||
}
|
||||
|
||||
enum shift_direction {
|
||||
SHIFT_LEFT = 0,
|
||||
SHIFT_RIGHT,
|
||||
};
|
||||
|
||||
void xfs_trim_extent(struct xfs_bmbt_irec *irec, xfs_fileoff_t bno,
|
||||
xfs_filblks_t len);
|
||||
void xfs_trim_extent_eof(struct xfs_bmbt_irec *, struct xfs_inode *);
|
||||
|
|
|
|||
Loading…
Reference in a new issue