public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] xfs: add missing break in xfs_parseargs()
@ 2016-03-31  9:13 Eryu Guan
  2016-03-31 11:14 ` Eryu Guan
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Eryu Guan @ 2016-03-31  9:13 UTC (permalink / raw)
  To: xfs; +Cc: Eryu Guan, esandeen

Commit 2e74af0e1189 ("xfs: convert mount option parsing to tokens")
missed a 'break;' in xfs_parseargs() which causes mount to fail with
"-o pqnoenforce" option. xfs/050 catches this failure.

XFS (vda6): Super block does not support project and group quota together

Fixes: 2e74af0e1189 ("xfs: convert mount option parsing to tokens")
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
---
 fs/xfs/xfs_super.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index d760934..361564e 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -350,6 +350,7 @@ xfs_parseargs(
 		case Opt_pqnoenforce:
 			mp->m_qflags |= (XFS_PQUOTA_ACCT | XFS_PQUOTA_ACTIVE);
 			mp->m_qflags &= ~XFS_PQUOTA_ENFD;
+			break;
 		case Opt_gquota:
 		case Opt_grpquota:
 			mp->m_qflags |= (XFS_GQUOTA_ACCT | XFS_GQUOTA_ACTIVE |
-- 
2.5.5

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

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] xfs: add missing break in xfs_parseargs()
  2016-03-31  9:13 [PATCH] xfs: add missing break in xfs_parseargs() Eryu Guan
@ 2016-03-31 11:14 ` Eryu Guan
  2016-03-31 14:52 ` Brian Foster
  2016-03-31 15:04 ` Eric Sandeen
  2 siblings, 0 replies; 4+ messages in thread
From: Eryu Guan @ 2016-03-31 11:14 UTC (permalink / raw)
  To: xfs; +Cc: esandeen

On Thu, Mar 31, 2016 at 05:13:03PM +0800, Eryu Guan wrote:
> Commit 2e74af0e1189 ("xfs: convert mount option parsing to tokens")
> missed a 'break;' in xfs_parseargs() which causes mount to fail with
> "-o pqnoenforce" option. xfs/050 catches this failure.
> 
> XFS (vda6): Super block does not support project and group quota together

Forgot to mention that it only fails for v4 xfs, but v5 xfs enables
group quota automatically in this case.

Thanks,
Eryu

> 
> Fixes: 2e74af0e1189 ("xfs: convert mount option parsing to tokens")
> Signed-off-by: Eryu Guan <guaneryu@gmail.com>
> ---
>  fs/xfs/xfs_super.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
> index d760934..361564e 100644
> --- a/fs/xfs/xfs_super.c
> +++ b/fs/xfs/xfs_super.c
> @@ -350,6 +350,7 @@ xfs_parseargs(
>  		case Opt_pqnoenforce:
>  			mp->m_qflags |= (XFS_PQUOTA_ACCT | XFS_PQUOTA_ACTIVE);
>  			mp->m_qflags &= ~XFS_PQUOTA_ENFD;
> +			break;
>  		case Opt_gquota:
>  		case Opt_grpquota:
>  			mp->m_qflags |= (XFS_GQUOTA_ACCT | XFS_GQUOTA_ACTIVE |
> -- 
> 2.5.5
> 

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] xfs: add missing break in xfs_parseargs()
  2016-03-31  9:13 [PATCH] xfs: add missing break in xfs_parseargs() Eryu Guan
  2016-03-31 11:14 ` Eryu Guan
@ 2016-03-31 14:52 ` Brian Foster
  2016-03-31 15:04 ` Eric Sandeen
  2 siblings, 0 replies; 4+ messages in thread
From: Brian Foster @ 2016-03-31 14:52 UTC (permalink / raw)
  To: Eryu Guan; +Cc: esandeen, xfs

On Thu, Mar 31, 2016 at 05:13:03PM +0800, Eryu Guan wrote:
> Commit 2e74af0e1189 ("xfs: convert mount option parsing to tokens")
> missed a 'break;' in xfs_parseargs() which causes mount to fail with
> "-o pqnoenforce" option. xfs/050 catches this failure.
> 
> XFS (vda6): Super block does not support project and group quota together
> 
> Fixes: 2e74af0e1189 ("xfs: convert mount option parsing to tokens")
> Signed-off-by: Eryu Guan <guaneryu@gmail.com>
> ---

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

>  fs/xfs/xfs_super.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
> index d760934..361564e 100644
> --- a/fs/xfs/xfs_super.c
> +++ b/fs/xfs/xfs_super.c
> @@ -350,6 +350,7 @@ xfs_parseargs(
>  		case Opt_pqnoenforce:
>  			mp->m_qflags |= (XFS_PQUOTA_ACCT | XFS_PQUOTA_ACTIVE);
>  			mp->m_qflags &= ~XFS_PQUOTA_ENFD;
> +			break;
>  		case Opt_gquota:
>  		case Opt_grpquota:
>  			mp->m_qflags |= (XFS_GQUOTA_ACCT | XFS_GQUOTA_ACTIVE |
> -- 
> 2.5.5
> 
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] xfs: add missing break in xfs_parseargs()
  2016-03-31  9:13 [PATCH] xfs: add missing break in xfs_parseargs() Eryu Guan
  2016-03-31 11:14 ` Eryu Guan
  2016-03-31 14:52 ` Brian Foster
@ 2016-03-31 15:04 ` Eric Sandeen
  2 siblings, 0 replies; 4+ messages in thread
From: Eric Sandeen @ 2016-03-31 15:04 UTC (permalink / raw)
  To: xfs

On 3/31/16 4:13 AM, Eryu Guan wrote:
> Commit 2e74af0e1189 ("xfs: convert mount option parsing to tokens")
> missed a 'break;' in xfs_parseargs() which causes mount to fail with
> "-o pqnoenforce" option. xfs/050 catches this failure.
> 
> XFS (vda6): Super block does not support project and group quota together
> 
> Fixes: 2e74af0e1189 ("xfs: convert mount option parsing to tokens")
> Signed-off-by: Eryu Guan <guaneryu@gmail.com>

Ugh, how did I miss that; I thought I scripted that whole change.

Thanks for catching it!

Reviewed-by: Eric Sandeen <sandeen@redhat.com>

> ---
>  fs/xfs/xfs_super.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
> index d760934..361564e 100644
> --- a/fs/xfs/xfs_super.c
> +++ b/fs/xfs/xfs_super.c
> @@ -350,6 +350,7 @@ xfs_parseargs(
>  		case Opt_pqnoenforce:
>  			mp->m_qflags |= (XFS_PQUOTA_ACCT | XFS_PQUOTA_ACTIVE);
>  			mp->m_qflags &= ~XFS_PQUOTA_ENFD;
> +			break;
>  		case Opt_gquota:
>  		case Opt_grpquota:
>  			mp->m_qflags |= (XFS_GQUOTA_ACCT | XFS_GQUOTA_ACTIVE |
> 

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-03-31 15:04 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-31  9:13 [PATCH] xfs: add missing break in xfs_parseargs() Eryu Guan
2016-03-31 11:14 ` Eryu Guan
2016-03-31 14:52 ` Brian Foster
2016-03-31 15:04 ` Eric Sandeen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox