[PATCH] xfs_copy: fix copy of hard 4k devices

[Brian Foster]

On Wed, Jun 17, 2015 at 02:24:18PM -0500, Eric Sandeen wrote:
> If we have a pure 4k device with no 512 emulation, xfs_copy
> fails straightaway because it tries to do a 512-byte direct
> IO read of the superblock.
> 
> Do like we do in xfs_db, and read in the max possible sector size,
> because we don't yet know what the filesystem's sector size is.
> 
> This fixes a failure in xfs/032 on a hard 4k device.
> 
> Signed-off-by: Eric Sandeen <sandeen at redhat.com>
> ---

Reviewed-by: Brian Foster <bfoster at redhat.com>

> 
> diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c
> index 279527c..b39c84d 100644
> --- a/copy/xfs_copy.c
> +++ b/copy/xfs_copy.c
> @@ -654,8 +654,9 @@ main(int argc, char **argv)
>  
>  	memset(&mbuf, 0, sizeof(xfs_mount_t));
>  	libxfs_buftarg_init(&mbuf, xargs.ddev, xargs.logdev, xargs.rtdev);
> -	sbp = libxfs_readbuf(mbuf.m_ddev_targp, XFS_SB_DADDR, 1, 0,
> -							&xfs_sb_buf_ops);
> +	sbp = libxfs_readbuf(mbuf.m_ddev_targp, XFS_SB_DADDR,
> +			     1 << (XFS_MAX_SECTORSIZE_LOG - BBSHIFT),
> +			     0, &xfs_sb_buf_ops);
>  	sb = &mbuf.m_sb;
>  	libxfs_sb_from_disk(sb, XFS_BUF_TO_SBP(sbp));
>  
> 
> _______________________________________________
> xfs mailing list
> xfs at oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs