On Fri, Aug 30, 2019 at 12:24:09PM +0200, Christoph Hellwig wrote:
> Add a helper that validates the startblock is valid. This checks for a
> non-zero block on the main device, but skips that check for blocks on
> the realtime device.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
> fs/xfs/libxfs/xfs_bmap.c | 2 +-
> fs/xfs/libxfs/xfs_bmap.h | 3 +++
> fs/xfs/xfs_iomap.c | 6 +++---
> 3 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index 05aedf4a538c..80b25e21e708 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -4519,7 +4519,7 @@ xfs_bmapi_convert_delalloc(
> if (WARN_ON_ONCE(bma.blkno == NULLFSBLOCK))
> goto out_finish;
> error = -EFSCORRUPTED;
> - if (WARN_ON_ONCE(!bma.got.br_startblock && !XFS_IS_REALTIME_INODE(ip)))
> + if (WARN_ON_ONCE(!xfs_valid_startblock(ip, bma.got.br_startblock)))
> goto out_finish;
>
> XFS_STATS_ADD(mp, xs_xstrat_bytes, XFS_FSB_TO_B(mp, bma.length));
> diff --git a/fs/xfs/libxfs/xfs_bmap.h b/fs/xfs/libxfs/xfs_bmap.h
> index c409871a096e..7efa56e8750f 100644
> --- a/fs/xfs/libxfs/xfs_bmap.h
> +++ b/fs/xfs/libxfs/xfs_bmap.h
> @@ -171,6 +171,9 @@ static inline bool xfs_bmap_is_real_extent(struct xfs_bmbt_irec *irec)
> !isnullstartblock(irec->br_startblock);
> }
>
> +#define xfs_valid_startblock(ip, startblock) \
> + ((startblock) != 0 || XFS_IS_REALTIME_INODE(ip))
We have more robust validators for data/rtdev fsblock_t, so why not:
#define xfs_valid_startblock(ip, startblock) \
(XFS_IS_REALTIME_INODE(ip) ? xfs_verify_rtbno(startblock) : \
xfs_verify_fsbno(startblock))
and why not make it a static inline function too?
--D
> +
> void xfs_trim_extent(struct xfs_bmbt_irec *irec, xfs_fileoff_t bno,
> xfs_filblks_t len);
> int xfs_bmap_add_attrfork(struct xfs_inode *ip, int size, int rsvd);
> diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
> index 3a4310d7cb59..f780e223b118 100644
> --- a/fs/xfs/xfs_iomap.c
> +++ b/fs/xfs/xfs_iomap.c
> @@ -58,7 +58,7 @@ xfs_bmbt_to_iomap(
> {
> struct xfs_mount *mp = ip->i_mount;
>
> - if (unlikely(!imap->br_startblock && !XFS_IS_REALTIME_INODE(ip)))
> + if (unlikely(!xfs_valid_startblock(ip, imap->br_startblock)))
> return xfs_alert_fsblock_zero(ip, imap);
>
> if (imap->br_startblock == HOLESTARTBLOCK) {
> @@ -297,7 +297,7 @@ xfs_iomap_write_direct(
> goto out_unlock;
> }
>
> - if (!(imap->br_startblock || XFS_IS_REALTIME_INODE(ip)))
> + if (unlikely(!xfs_valid_startblock(ip, imap->br_startblock)))
> error = xfs_alert_fsblock_zero(ip, imap);
>
> out_unlock:
> @@ -814,7 +814,7 @@ xfs_iomap_write_unwritten(
> if (error)
> return error;
>
> - if (!(imap.br_startblock || XFS_IS_REALTIME_INODE(ip)))
> + if (unlikely(!xfs_valid_startblock(ip, imap.br_startblock)))
> return xfs_alert_fsblock_zero(ip, &imap);
>
> if ((numblks_fsb = imap.br_blockcount) == 0) {
> --
> 2.20.1
>
