[PATCH] xfs_mkfs: Do not discard if '-N' is provided

[Eric Sandeen]

On 2/12/13 5:59 AM, Lukas Czerner wrote:
> When '-N' is specified we really should not write anything to the
> device, neither we should attempt to discard the device.
> 
> This commit fixes xfs_mkfs to not attempt to discard the device in the
> case user specified '-N' flag.

Thanks, and yes - ouch, this shouldn't happen with -N, that's bad!

But it doesn't look like this is against the current git tree,
it applies only with a lot of fuzz & offsets.

-Eric

> Signed-off-by: Lukas Czerner <lczerner at redhat.com>
> ---
>  mkfs/xfs_mkfs.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
> index a889620..95e27e0 100644
> --- a/mkfs/xfs_mkfs.c
> +++ b/mkfs/xfs_mkfs.c
> @@ -2010,7 +2010,7 @@ _("block size %d cannot be smaller than logical sector size %d\n"),
>  			exit(1);
>  		}
>  
> -	if (discard) {
> +	if (discard && !Nflag) {
>  		discard_blocks(xi.ddev, xi.dsize);
>  		if (xi.rtdev)
>  			discard_blocks(xi.rtdev, xi.rtsize);
>