On Mon, Nov 14, 2016 at 06:12:37PM +0100, Christoph Hellwig wrote:
> We can easily lookup the previous extent for the cases where we need it,
> which saves the callers from looking it up for us later in the series.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
> fs/xfs/libxfs/xfs_bmap.c | 8 ++++++--
> fs/xfs/libxfs/xfs_bmap.h | 3 +--
> fs/xfs/xfs_iomap.c | 3 +--
> fs/xfs/xfs_reflink.c | 2 +-
> 4 files changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index 18de89c..4aa9c07 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -4235,7 +4235,6 @@ xfs_bmapi_reserve_delalloc(
> xfs_fileoff_t aoff,
> xfs_filblks_t len,
> struct xfs_bmbt_irec *got,
> - struct xfs_bmbt_irec *prev,
> xfs_extnum_t *lastx,
> int eof)
> {
> @@ -4257,7 +4256,12 @@ xfs_bmapi_reserve_delalloc(
> else
> extsz = xfs_get_extsz_hint(ip);
> if (extsz) {
> - error = xfs_bmap_extsize_align(mp, got, prev, extsz, rt, eof,
> + struct xfs_bmbt_irec prev;
> +
> + if (!xfs_iext_get_extent(ifp, *lastx - 1, &prev))
> + prev.br_startoff = NULLFILEOFF;
It just hit me that extnum_t is signed and xfs_iext_get_extent() checks
for < 0, so that covers here and my similar previous few comments. I
still think we should probably check it in context rather than bury the
check in the caller (I'd prefer an assert). Just my .02.
Brian
> +
> + error = xfs_bmap_extsize_align(mp, got, &prev, extsz, rt, eof,
> 1, 0, &aoff, &alen);
> ASSERT(!error);
> }
> diff --git a/fs/xfs/libxfs/xfs_bmap.h b/fs/xfs/libxfs/xfs_bmap.h
> index 7cae6ec..e3c2b5a 100644
> --- a/fs/xfs/libxfs/xfs_bmap.h
> +++ b/fs/xfs/libxfs/xfs_bmap.h
> @@ -243,8 +243,7 @@ struct xfs_bmbt_rec_host *
> struct xfs_bmbt_irec *gotp, struct xfs_bmbt_irec *prevp);
> int xfs_bmapi_reserve_delalloc(struct xfs_inode *ip, int whichfork,
> xfs_fileoff_t aoff, xfs_filblks_t len,
> - struct xfs_bmbt_irec *got, struct xfs_bmbt_irec *prev,
> - xfs_extnum_t *lastx, int eof);
> + struct xfs_bmbt_irec *got, xfs_extnum_t *lastx, int eof);
>
> enum xfs_bmap_intent_type {
> XFS_BMAP_MAP = 1,
> diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
> index 436e109..59ffcac 100644
> --- a/fs/xfs/xfs_iomap.c
> +++ b/fs/xfs/xfs_iomap.c
> @@ -622,8 +622,7 @@ xfs_file_iomap_begin_delay(
>
> retry:
> error = xfs_bmapi_reserve_delalloc(ip, XFS_DATA_FORK, offset_fsb,
> - end_fsb - offset_fsb, &got,
> - &prev, &idx, eof);
> + end_fsb - offset_fsb, &got, &idx, eof);
> switch (error) {
> case 0:
> break;
> diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
> index 0edf835..52cdfba 100644
> --- a/fs/xfs/xfs_reflink.c
> +++ b/fs/xfs/xfs_reflink.c
> @@ -293,7 +293,7 @@ xfs_reflink_reserve_cow(
>
> retry:
> error = xfs_bmapi_reserve_delalloc(ip, XFS_COW_FORK, imap->br_startoff,
> - end_fsb - imap->br_startoff, &got, &prev, &idx, eof);
> + end_fsb - imap->br_startoff, &got, &idx, eof);
> switch (error) {
> case 0:
> break;
> --
> 2.1.4
>
> --
> 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
