On Fri, Sep 15, 2017 at 07:54:15AM -0700, Christoph Hellwig wrote:
> Use the _FILLING values to match the usage in the xfs_bmap_add_extent_*
> helpers. No change in behavior, just better naming in the code and
> tracepoint output.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> Reported-by: Brian Foster <bfoster@xxxxxxxxxx>
> ---
Thanks for fixing this up, looks good..
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> fs/xfs/libxfs/xfs_bmap.c | 24 ++++++++++++------------
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index 06f1bd9e144e..aa4af31750d3 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -4897,19 +4897,19 @@ xfs_bmap_del_extent_delay(
> state |= BMAP_COWFORK;
>
> if (got->br_startoff == del->br_startoff)
> - state |= BMAP_LEFT_CONTIG;
> + state |= BMAP_LEFT_FILLING;
> if (got_endoff == del_endoff)
> - state |= BMAP_RIGHT_CONTIG;
> + state |= BMAP_RIGHT_FILLING;
>
> - switch (state & (BMAP_LEFT_CONTIG | BMAP_RIGHT_CONTIG)) {
> - case BMAP_LEFT_CONTIG | BMAP_RIGHT_CONTIG:
> + switch (state & (BMAP_LEFT_FILLING | BMAP_RIGHT_FILLING)) {
> + case BMAP_LEFT_FILLING | BMAP_RIGHT_FILLING:
> /*
> * Matches the whole extent. Delete the entry.
> */
> xfs_iext_remove(ip, *idx, 1, state);
> --*idx;
> break;
> - case BMAP_LEFT_CONTIG:
> + case BMAP_LEFT_FILLING:
> /*
> * Deleting the first part of the extent.
> */
> @@ -4922,7 +4922,7 @@ xfs_bmap_del_extent_delay(
> xfs_iext_update_extent(ifp, *idx, got);
> trace_xfs_bmap_post_update(ip, *idx, state, _THIS_IP_);
> break;
> - case BMAP_RIGHT_CONTIG:
> + case BMAP_RIGHT_FILLING:
> /*
> * Deleting the last part of the extent.
> */
> @@ -5007,19 +5007,19 @@ xfs_bmap_del_extent_cow(
> ASSERT(!isnullstartblock(got->br_startblock));
>
> if (got->br_startoff == del->br_startoff)
> - state |= BMAP_LEFT_CONTIG;
> + state |= BMAP_LEFT_FILLING;
> if (got_endoff == del_endoff)
> - state |= BMAP_RIGHT_CONTIG;
> + state |= BMAP_RIGHT_FILLING;
>
> - switch (state & (BMAP_LEFT_CONTIG | BMAP_RIGHT_CONTIG)) {
> - case BMAP_LEFT_CONTIG | BMAP_RIGHT_CONTIG:
> + switch (state & (BMAP_LEFT_FILLING | BMAP_RIGHT_FILLING)) {
> + case BMAP_LEFT_FILLING | BMAP_RIGHT_FILLING:
> /*
> * Matches the whole extent. Delete the entry.
> */
> xfs_iext_remove(ip, *idx, 1, state);
> --*idx;
> break;
> - case BMAP_LEFT_CONTIG:
> + case BMAP_LEFT_FILLING:
> /*
> * Deleting the first part of the extent.
> */
> @@ -5030,7 +5030,7 @@ xfs_bmap_del_extent_cow(
> xfs_iext_update_extent(ifp, *idx, got);
> trace_xfs_bmap_post_update(ip, *idx, state, _THIS_IP_);
> break;
> - case BMAP_RIGHT_CONTIG:
> + case BMAP_RIGHT_FILLING:
> /*
> * Deleting the last part of the extent.
> */
> --
> 2.14.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
