From mboxrd@z Thu Jan  1 00:00:00 1970
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Wed, 05 May 2010 10:07:00 +0100
Subject: [Cluster-devel] [PATCH] gfs2: fix quota state reporting
In-Reply-To: <20100504221056.GB319@lst.de>
References: <20100504221056.GB319@lst.de>
Message-ID: <1273050420.2517.1.camel@localhost>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

Hi,

Now in the GFS2 -nmw git tree. Thanks,

Steve.

On Wed, 2010-05-05 at 00:10 +0200, Christoph Hellwig wrote:
> We need to report both the accounting and enforcing flags if we are
> in enforcing mode.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> 
> Index: xfs/fs/gfs2/quota.c
> ===================================================================
> --- xfs.orig/fs/gfs2/quota.c	2010-05-04 23:16:59.718256886 +0200
> +++ xfs/fs/gfs2/quota.c	2010-05-04 23:54:25.643255558 +0200
> @@ -1418,10 +1418,18 @@ static int gfs2_quota_get_xstate(struct
>  
>  	memset(fqs, 0, sizeof(struct fs_quota_stat));
>  	fqs->qs_version = FS_QSTAT_VERSION;
> -	if (sdp->sd_args.ar_quota == GFS2_QUOTA_ON)
> -		fqs->qs_flags = (XFS_QUOTA_UDQ_ENFD | XFS_QUOTA_GDQ_ENFD);
> -	else if (sdp->sd_args.ar_quota == GFS2_QUOTA_ACCOUNT)
> -		fqs->qs_flags = (XFS_QUOTA_UDQ_ACCT | XFS_QUOTA_GDQ_ACCT);
> +
> +	switch (sdp->sd_args.ar_quota) {
> +	case GFS2_QUOTA_ON:
> +		fqs->qs_flags |= (XFS_QUOTA_UDQ_ENFD | XFS_QUOTA_GDQ_ENFD);
> +		/*FALLTHRU*/
> +	case GFS2_QUOTA_ACCOUNT:
> +		fqs->qs_flags |= (XFS_QUOTA_UDQ_ACCT | XFS_QUOTA_GDQ_ACCT);
> +		break;
> +	case GFS2_QUOTA_OFF:
> +		break;
> +	}
> +
>  	if (sdp->sd_quota_inode) {
>  		fqs->qs_uquota.qfs_ino = GFS2_I(sdp->sd_quota_inode)->i_no_addr;
>  		fqs->qs_uquota.qfs_nblks = sdp->sd_quota_inode->i_blocks;