Re: [PATCH v2] xfs: BMAPX shouldn't barf on inline-format directories

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, May 10, 2017 at 11:23:25AM -0700, Darrick J. Wong wrote:
> When we're fulfilling a BMAPX request, jump out early if the data fork
> is in local format.  This prevents us from hitting a debugging check in
> bmapi_read and barfing errors back to userspace.  The on-disk extent
> count check later isn't sufficient for IF_DELALLOC mode because da
> extents are in memory and not on disk.
> 
> Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> ---

Looks good:

Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>

> v2: move the check earlier in the function
> ---
>  fs/xfs/xfs_bmap_util.c |    8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
> index 7ac80a1..3aefcf2 100644
> --- a/fs/xfs/xfs_bmap_util.c
> +++ b/fs/xfs/xfs_bmap_util.c
> @@ -582,9 +582,13 @@ xfs_getbmap(
>  		}
>  		break;
>  	default:
> +		/* Local format data forks report no extents. */
> +		if (ip->i_d.di_format == XFS_DINODE_FMT_LOCAL) {
> +			bmv->bmv_entries = 0;
> +			return 0;
> +		}
>  		if (ip->i_d.di_format != XFS_DINODE_FMT_EXTENTS &&
> -		    ip->i_d.di_format != XFS_DINODE_FMT_BTREE &&
> -		    ip->i_d.di_format != XFS_DINODE_FMT_LOCAL)
> +		    ip->i_d.di_format != XFS_DINODE_FMT_BTREE)
>  			return -EINVAL;
>  
>  		if (xfs_get_extsz_hint(ip) ||
--
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



[Index of Archives]     [XFS Filesystem Development (older mail)]     [Linux Filesystem Development]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux RAID]     [Linux SCSI]


  Powered by Linux