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

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

[Lukas Czerner]

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.

Signed-off-by: Lukas Czerner <lczerner@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);
-- 
1.7.7.6

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [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@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);
> 

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

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

[Lukáš Czerner]

On Tue, 12 Feb 2013, Eric Sandeen wrote:

> Date: Tue, 12 Feb 2013 09:11:38 -0600
> From: Eric Sandeen <sandeen@sandeen.net>
> To: Lukas Czerner <lczerner@redhat.com>
> Cc: xfs@oss.sgi.com
> Subject: Re: [PATCH] xfs_mkfs: Do not discard if '-N' is provided
> 
> 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.

Ah, I've been using 

git://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git

and I can remember that it's not the first time I've realized that I
am using wrong repo. Obviously i am not paying a lot of attention to
the xfs channel, but does this keep changing, or is it just me ? :)

Will resend the patch based on the

git://oss.sgi.com/xfs/cmds/xfsprogs.git

thanks Eric!

-Lukas

> 
> -Eric
> 
> > Signed-off-by: Lukas Czerner <lczerner@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);
> > 
> 
> 

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

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

[Ben Myers]

Hey Lukas,

On Tue, Feb 12, 2013 at 04:37:37PM +0100, Lukáš Czerner wrote:
> On Tue, 12 Feb 2013, Eric Sandeen wrote:
> 
> > Date: Tue, 12 Feb 2013 09:11:38 -0600
> > From: Eric Sandeen <sandeen@sandeen.net>
> > To: Lukas Czerner <lczerner@redhat.com>
> > Cc: xfs@oss.sgi.com
> > Subject: Re: [PATCH] xfs_mkfs: Do not discard if '-N' is provided
> > 
> > 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.
> 
> Ah, I've been using 
> 
> git://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git
> 
> and I can remember that it's not the first time I've realized that I
> am using wrong repo. Obviously i am not paying a lot of attention to
> the xfs channel, but does this keep changing, or is it just me ? :)

It changed just twice, AFAIK.

Christoph, could you clean up the kernel.org trees to help resolve the
confusion?

> Will resend the patch based on the
> 
> git://oss.sgi.com/xfs/cmds/xfsprogs.git

This is the right place, thanks.

Regards,
	Ben

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs