gfs2: fix quota state reporting
Subsystems (2)
PATCH 1/1 gfs2: fix quota state reporting
We need to report both the accounting and enforcing flags if we are in enforcing mode.
Signed-off-by Christoph Hellwig <[email protected]>
fs/gfs2/quota.c +12 -4
@@ -1418,10 +1418,18 @@ static int gfs2_quota_get_xstate(structmemset (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;
Hi,
Now in the GFS2 -nmw git tree. Thanks,
Steve.
Quoted 32 lines · Christoph Hellwig
We need to report both the accounting and enforcing flags if we are in enforcing mode.
Signed-off-by Christoph Hellwig <[email protected]>Index:
xfs/fs/gfs2/quota.c
===================================================================fs/gfs2/quota.c +12
-4@@ -1418,10 +1418,18 @@ static int gfs2_quota_get_xstate(structmemset (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;