[PATCH 0/3] xfs: Quota related cleanups

[PATCH 0/3] xfs: Quota related cleanups

[Jan Kara]

  Hello,

  this series contains quota related cleanups that were part of my series
unifying VFS and XFS quota interfaces. The series is based on for-next branch
of XFS tree. I'd like some XFS guy to review them and either ack them so
that I can merge them through my tree (that would be probably easier for me)
or merge them directly via XFS tree (I can cope as well - I can pull for-next
branch of XFS tree into my tree and base unification series on top of that).

								Honza

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

[PATCH 1/3] xfs: Remove useless test

[Jan Kara]

Q_XQUOTARM is never passed to xfs_fs_set_xstate() so remove the test.

Signed-off-by: Jan Kara <jack@suse.cz>
---
 fs/xfs/xfs_quotaops.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/xfs/xfs_quotaops.c b/fs/xfs/xfs_quotaops.c
index 7542bbeca6a1..8fcd20dbf89a 100644
--- a/fs/xfs/xfs_quotaops.c
+++ b/fs/xfs/xfs_quotaops.c
@@ -75,7 +75,7 @@ xfs_fs_set_xstate(
 
 	if (sb->s_flags & MS_RDONLY)
 		return -EROFS;
-	if (op != Q_XQUOTARM && !XFS_IS_QUOTA_RUNNING(mp))
+	if (!XFS_IS_QUOTA_RUNNING(mp))
 		return -ENOSYS;
 
 	if (uflags & FS_QUOTA_UDQ_ACCT)
-- 
2.1.2

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

Re: [PATCH 1/3] xfs: Remove useless test

[Brian Foster]

On Thu, Jan 15, 2015 at 11:18:03AM +0100, Jan Kara wrote:
> Q_XQUOTARM is never passed to xfs_fs_set_xstate() so remove the test.
> 
> Signed-off-by: Jan Kara <jack@suse.cz>
> ---

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

>  fs/xfs/xfs_quotaops.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/xfs/xfs_quotaops.c b/fs/xfs/xfs_quotaops.c
> index 7542bbeca6a1..8fcd20dbf89a 100644
> --- a/fs/xfs/xfs_quotaops.c
> +++ b/fs/xfs/xfs_quotaops.c
> @@ -75,7 +75,7 @@ xfs_fs_set_xstate(
>  
>  	if (sb->s_flags & MS_RDONLY)
>  		return -EROFS;
> -	if (op != Q_XQUOTARM && !XFS_IS_QUOTA_RUNNING(mp))
> +	if (!XFS_IS_QUOTA_RUNNING(mp))
>  		return -ENOSYS;
>  
>  	if (uflags & FS_QUOTA_UDQ_ACCT)
> -- 
> 2.1.2
> 
> _______________________________________________
> 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

Re: [PATCH 1/3] xfs: Remove useless test

[Jan Kara]

On Thu 15-01-15 08:27:54, Brian Foster wrote:
> On Thu, Jan 15, 2015 at 11:18:03AM +0100, Jan Kara wrote:
> > Q_XQUOTARM is never passed to xfs_fs_set_xstate() so remove the test.
> > 
> > Signed-off-by: Jan Kara <jack@suse.cz>
> > ---
> 
> Reviewed-by: Brian Foster <bfoster@redhat.com>
  Thanks for reviews! I've pulled the XFS cleanups from this series into my
tree.
								Honza

> >  fs/xfs/xfs_quotaops.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/fs/xfs/xfs_quotaops.c b/fs/xfs/xfs_quotaops.c
> > index 7542bbeca6a1..8fcd20dbf89a 100644
> > --- a/fs/xfs/xfs_quotaops.c
> > +++ b/fs/xfs/xfs_quotaops.c
> > @@ -75,7 +75,7 @@ xfs_fs_set_xstate(
> >  
> >  	if (sb->s_flags & MS_RDONLY)
> >  		return -EROFS;
> > -	if (op != Q_XQUOTARM && !XFS_IS_QUOTA_RUNNING(mp))
> > +	if (!XFS_IS_QUOTA_RUNNING(mp))
> >  		return -ENOSYS;
> >  
> >  	if (uflags & FS_QUOTA_UDQ_ACCT)
> > -- 
> > 2.1.2
> > 
> > _______________________________________________
> > xfs mailing list
> > xfs@oss.sgi.com
> > http://oss.sgi.com/mailman/listinfo/xfs
-- 
Jan Kara <jack@suse.cz>
SUSE Labs, CR

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

Re: [PATCH 1/3] xfs: Remove useless test

[Dave Chinner]

On Tue, Jan 20, 2015 at 05:44:00PM +0100, Jan Kara wrote:
> On Thu 15-01-15 08:27:54, Brian Foster wrote:
> > On Thu, Jan 15, 2015 at 11:18:03AM +0100, Jan Kara wrote:
> > > Q_XQUOTARM is never passed to xfs_fs_set_xstate() so remove the test.
> > > 
> > > Signed-off-by: Jan Kara <jack@suse.cz>
> > > ---
> > 
> > Reviewed-by: Brian Foster <bfoster@redhat.com>
>   Thanks for reviews! I've pulled the XFS cleanups from this series into my
> tree.

Hi Jan,

I've been at LCA last week and sick all this week as a result, so I
haven't yet got to pulling these into the XFS tree. Do you still
want me to give you a stable branch with these changes in it to base
your series off?

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

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

Re: [PATCH 1/3] xfs: Remove useless test

[Jan Kara]

  Hello,

On Wed 21-01-15 09:14:53, Dave Chinner wrote:
> On Tue, Jan 20, 2015 at 05:44:00PM +0100, Jan Kara wrote:
> > On Thu 15-01-15 08:27:54, Brian Foster wrote:
> > > On Thu, Jan 15, 2015 at 11:18:03AM +0100, Jan Kara wrote:
> > > > Q_XQUOTARM is never passed to xfs_fs_set_xstate() so remove the test.
> > > > 
> > > > Signed-off-by: Jan Kara <jack@suse.cz>
> > > > ---
> > > 
> > > Reviewed-by: Brian Foster <bfoster@redhat.com>
> >   Thanks for reviews! I've pulled the XFS cleanups from this series into my
> > tree.
> 
> I've been at LCA last week and sick all this week as a result, so I
> haven't yet got to pulling these into the XFS tree. Do you still
> want me to give you a stable branch with these changes in it to base
> your series off?
  If you don't mind, I would just carry those three XFS cleanups together
with the rest of the quota interface series in my tree. Currently there
don't seem to be any conflicts with what's in XFS tree so it's easy. And
the series touches XFS in those areas later anyway...

								Honza
-- 
Jan Kara <jack@suse.cz>
SUSE Labs, CR

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

Re: [PATCH 1/3] xfs: Remove useless test

[Dave Chinner]

On Tue, Jan 20, 2015 at 11:35:15PM +0100, Jan Kara wrote:
>   Hello,
> 
> On Wed 21-01-15 09:14:53, Dave Chinner wrote:
> > On Tue, Jan 20, 2015 at 05:44:00PM +0100, Jan Kara wrote:
> > > On Thu 15-01-15 08:27:54, Brian Foster wrote:
> > > > On Thu, Jan 15, 2015 at 11:18:03AM +0100, Jan Kara wrote:
> > > > > Q_XQUOTARM is never passed to xfs_fs_set_xstate() so remove the test.
> > > > > 
> > > > > Signed-off-by: Jan Kara <jack@suse.cz>
> > > > > ---
> > > > 
> > > > Reviewed-by: Brian Foster <bfoster@redhat.com>
> > >   Thanks for reviews! I've pulled the XFS cleanups from this series into my
> > > tree.
> > 
> > I've been at LCA last week and sick all this week as a result, so I
> > haven't yet got to pulling these into the XFS tree. Do you still
> > want me to give you a stable branch with these changes in it to base
> > your series off?
>   If you don't mind, I would just carry those three XFS cleanups together
> with the rest of the quota interface series in my tree. Currently there
> don't seem to be any conflicts with what's in XFS tree so it's easy. And
> the series touches XFS in those areas later anyway...

Fine by me.

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

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

[PATCH 2/3] xfs: Remove some useless flags tests

[Jan Kara]

'flags' have XFS_ALL_QUOTA_ACCT cleared immediately on function entry.
There's no point in checking these bits later in the function. Also
because we check something is going to change, we know some enforcement
bits are being added and thus there's no point in testing that later.

Signed-off-by: Jan Kara <jack@suse.cz>
---
 fs/xfs/xfs_qm_syscalls.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
index b8a565edb4ae..a8c673dbff32 100644
--- a/fs/xfs/xfs_qm_syscalls.c
+++ b/fs/xfs/xfs_qm_syscalls.c
@@ -326,22 +326,16 @@ xfs_qm_scall_quotaon(
 		return -EINVAL;
 	}
 
-	/* No fs can turn on quotas with a delayed effect */
-	ASSERT((flags & XFS_ALL_QUOTA_ACCT) == 0);
-
 	/*
 	 * Can't enforce without accounting. We check the superblock
 	 * qflags here instead of m_qflags because rootfs can have
 	 * quota acct on ondisk without m_qflags' knowing.
 	 */
-	if (((flags & XFS_UQUOTA_ACCT) == 0 &&
-	     (mp->m_sb.sb_qflags & XFS_UQUOTA_ACCT) == 0 &&
+	if (((mp->m_sb.sb_qflags & XFS_UQUOTA_ACCT) == 0 &&
 	     (flags & XFS_UQUOTA_ENFD)) ||
-	    ((flags & XFS_GQUOTA_ACCT) == 0 &&
-	     (mp->m_sb.sb_qflags & XFS_GQUOTA_ACCT) == 0 &&
+	    ((mp->m_sb.sb_qflags & XFS_GQUOTA_ACCT) == 0 &&
 	     (flags & XFS_GQUOTA_ENFD)) ||
-	    ((flags & XFS_PQUOTA_ACCT) == 0 &&
-	     (mp->m_sb.sb_qflags & XFS_PQUOTA_ACCT) == 0 &&
+	    ((mp->m_sb.sb_qflags & XFS_PQUOTA_ACCT) == 0 &&
 	     (flags & XFS_PQUOTA_ENFD))) {
 		xfs_debug(mp,
 			"%s: Can't enforce without acct, flags=%x sbflags=%x",
@@ -380,8 +374,7 @@ xfs_qm_scall_quotaon(
 	     ((mp->m_sb.sb_qflags & XFS_PQUOTA_ACCT) !=
 	     (mp->m_qflags & XFS_PQUOTA_ACCT)) ||
 	     ((mp->m_sb.sb_qflags & XFS_GQUOTA_ACCT) !=
-	     (mp->m_qflags & XFS_GQUOTA_ACCT)) ||
-	    (flags & XFS_ALL_QUOTA_ENFD) == 0)
+	     (mp->m_qflags & XFS_GQUOTA_ACCT)))
 		return 0;
 
 	if (! XFS_IS_QUOTA_RUNNING(mp))
-- 
2.1.2

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

Re: [PATCH 2/3] xfs: Remove some useless flags tests

[Brian Foster]

On Thu, Jan 15, 2015 at 11:18:04AM +0100, Jan Kara wrote:
> 'flags' have XFS_ALL_QUOTA_ACCT cleared immediately on function entry.
> There's no point in checking these bits later in the function. Also
> because we check something is going to change, we know some enforcement
> bits are being added and thus there's no point in testing that later.
> 
> Signed-off-by: Jan Kara <jack@suse.cz>
> ---

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

>  fs/xfs/xfs_qm_syscalls.c | 15 ++++-----------
>  1 file changed, 4 insertions(+), 11 deletions(-)
> 
> diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
> index b8a565edb4ae..a8c673dbff32 100644
> --- a/fs/xfs/xfs_qm_syscalls.c
> +++ b/fs/xfs/xfs_qm_syscalls.c
> @@ -326,22 +326,16 @@ xfs_qm_scall_quotaon(
>  		return -EINVAL;
>  	}
>  
> -	/* No fs can turn on quotas with a delayed effect */
> -	ASSERT((flags & XFS_ALL_QUOTA_ACCT) == 0);
> -
>  	/*
>  	 * Can't enforce without accounting. We check the superblock
>  	 * qflags here instead of m_qflags because rootfs can have
>  	 * quota acct on ondisk without m_qflags' knowing.
>  	 */
> -	if (((flags & XFS_UQUOTA_ACCT) == 0 &&
> -	     (mp->m_sb.sb_qflags & XFS_UQUOTA_ACCT) == 0 &&
> +	if (((mp->m_sb.sb_qflags & XFS_UQUOTA_ACCT) == 0 &&
>  	     (flags & XFS_UQUOTA_ENFD)) ||
> -	    ((flags & XFS_GQUOTA_ACCT) == 0 &&
> -	     (mp->m_sb.sb_qflags & XFS_GQUOTA_ACCT) == 0 &&
> +	    ((mp->m_sb.sb_qflags & XFS_GQUOTA_ACCT) == 0 &&
>  	     (flags & XFS_GQUOTA_ENFD)) ||
> -	    ((flags & XFS_PQUOTA_ACCT) == 0 &&
> -	     (mp->m_sb.sb_qflags & XFS_PQUOTA_ACCT) == 0 &&
> +	    ((mp->m_sb.sb_qflags & XFS_PQUOTA_ACCT) == 0 &&
>  	     (flags & XFS_PQUOTA_ENFD))) {
>  		xfs_debug(mp,
>  			"%s: Can't enforce without acct, flags=%x sbflags=%x",
> @@ -380,8 +374,7 @@ xfs_qm_scall_quotaon(
>  	     ((mp->m_sb.sb_qflags & XFS_PQUOTA_ACCT) !=
>  	     (mp->m_qflags & XFS_PQUOTA_ACCT)) ||
>  	     ((mp->m_sb.sb_qflags & XFS_GQUOTA_ACCT) !=
> -	     (mp->m_qflags & XFS_GQUOTA_ACCT)) ||
> -	    (flags & XFS_ALL_QUOTA_ENFD) == 0)
> +	     (mp->m_qflags & XFS_GQUOTA_ACCT)))
>  		return 0;
>  
>  	if (! XFS_IS_QUOTA_RUNNING(mp))
> -- 
> 2.1.2
> 
> _______________________________________________
> 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

[PATCH 3/3] xfs: Remove some pointless quota checks

[Jan Kara]

xfs_fs_get_xstate() and xfs_fs_get_xstatev() check whether there's quota
running before calling xfs_qm_scall_getqstat() or
xfs_qm_scall_getqstatv(). Thus we are certain that superblock supports
quota and xfs_sb_version_hasquota() check is pointless. Similarly we
know that when quota is running, mp->m_quotainfo will be allocated.

Signed-off-by: Jan Kara <jack@suse.cz>
---
 fs/xfs/xfs_qm_syscalls.c | 59 ++++++++++++++++--------------------------------
 1 file changed, 20 insertions(+), 39 deletions(-)

diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
index a8c673dbff32..784c41b3ad84 100644
--- a/fs/xfs/xfs_qm_syscalls.c
+++ b/fs/xfs/xfs_qm_syscalls.c
@@ -411,20 +411,12 @@ xfs_qm_scall_getqstat(
 	memset(out, 0, sizeof(fs_quota_stat_t));
 
 	out->qs_version = FS_QSTAT_VERSION;
-	if (!xfs_sb_version_hasquota(&mp->m_sb)) {
-		out->qs_uquota.qfs_ino = NULLFSINO;
-		out->qs_gquota.qfs_ino = NULLFSINO;
-		return 0;
-	}
-
 	out->qs_flags = (__uint16_t) xfs_qm_export_flags(mp->m_qflags &
 							(XFS_ALL_QUOTA_ACCT|
 							 XFS_ALL_QUOTA_ENFD));
-	if (q) {
-		uip = q->qi_uquotaip;
-		gip = q->qi_gquotaip;
-		pip = q->qi_pquotaip;
-	}
+	uip = q->qi_uquotaip;
+	gip = q->qi_gquotaip;
+	pip = q->qi_pquotaip;
 	if (!uip && mp->m_sb.sb_uquotino != NULLFSINO) {
 		if (xfs_iget(mp, NULL, mp->m_sb.sb_uquotino,
 					0, 0, &uip) == 0)
@@ -470,14 +462,13 @@ xfs_qm_scall_getqstat(
 		if (temppqip)
 			IRELE(pip);
 	}
-	if (q) {
-		out->qs_incoredqs = q->qi_dquots;
-		out->qs_btimelimit = q->qi_btimelimit;
-		out->qs_itimelimit = q->qi_itimelimit;
-		out->qs_rtbtimelimit = q->qi_rtbtimelimit;
-		out->qs_bwarnlimit = q->qi_bwarnlimit;
-		out->qs_iwarnlimit = q->qi_iwarnlimit;
-	}
+	out->qs_incoredqs = q->qi_dquots;
+	out->qs_btimelimit = q->qi_btimelimit;
+	out->qs_itimelimit = q->qi_itimelimit;
+	out->qs_rtbtimelimit = q->qi_rtbtimelimit;
+	out->qs_bwarnlimit = q->qi_bwarnlimit;
+	out->qs_iwarnlimit = q->qi_iwarnlimit;
+
 	return 0;
 }
 
@@ -498,13 +489,6 @@ xfs_qm_scall_getqstatv(
 	bool                    tempgqip = false;
 	bool                    temppqip = false;
 
-	if (!xfs_sb_version_hasquota(&mp->m_sb)) {
-		out->qs_uquota.qfs_ino = NULLFSINO;
-		out->qs_gquota.qfs_ino = NULLFSINO;
-		out->qs_pquota.qfs_ino = NULLFSINO;
-		return 0;
-	}
-
 	out->qs_flags = (__uint16_t) xfs_qm_export_flags(mp->m_qflags &
 							(XFS_ALL_QUOTA_ACCT|
 							 XFS_ALL_QUOTA_ENFD));
@@ -512,11 +496,9 @@ xfs_qm_scall_getqstatv(
 	out->qs_gquota.qfs_ino = mp->m_sb.sb_gquotino;
 	out->qs_pquota.qfs_ino = mp->m_sb.sb_pquotino;
 
-	if (q) {
-		uip = q->qi_uquotaip;
-		gip = q->qi_gquotaip;
-		pip = q->qi_pquotaip;
-	}
+	uip = q->qi_uquotaip;
+	gip = q->qi_gquotaip;
+	pip = q->qi_pquotaip;
 	if (!uip && mp->m_sb.sb_uquotino != NULLFSINO) {
 		if (xfs_iget(mp, NULL, mp->m_sb.sb_uquotino,
 					0, 0, &uip) == 0)
@@ -551,14 +533,13 @@ xfs_qm_scall_getqstatv(
 		if (temppqip)
 			IRELE(pip);
 	}
-	if (q) {
-		out->qs_incoredqs = q->qi_dquots;
-		out->qs_btimelimit = q->qi_btimelimit;
-		out->qs_itimelimit = q->qi_itimelimit;
-		out->qs_rtbtimelimit = q->qi_rtbtimelimit;
-		out->qs_bwarnlimit = q->qi_bwarnlimit;
-		out->qs_iwarnlimit = q->qi_iwarnlimit;
-	}
+	out->qs_incoredqs = q->qi_dquots;
+	out->qs_btimelimit = q->qi_btimelimit;
+	out->qs_itimelimit = q->qi_itimelimit;
+	out->qs_rtbtimelimit = q->qi_rtbtimelimit;
+	out->qs_bwarnlimit = q->qi_bwarnlimit;
+	out->qs_iwarnlimit = q->qi_iwarnlimit;
+
 	return 0;
 }
 
-- 
2.1.2

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

Re: [PATCH 3/3] xfs: Remove some pointless quota checks

[Brian Foster]

On Thu, Jan 15, 2015 at 11:18:05AM +0100, Jan Kara wrote:
> xfs_fs_get_xstate() and xfs_fs_get_xstatev() check whether there's quota
> running before calling xfs_qm_scall_getqstat() or
> xfs_qm_scall_getqstatv(). Thus we are certain that superblock supports
> quota and xfs_sb_version_hasquota() check is pointless. Similarly we
> know that when quota is running, mp->m_quotainfo will be allocated.
> 
> Signed-off-by: Jan Kara <jack@suse.cz>
> ---

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

>  fs/xfs/xfs_qm_syscalls.c | 59 ++++++++++++++++--------------------------------
>  1 file changed, 20 insertions(+), 39 deletions(-)
> 
> diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
> index a8c673dbff32..784c41b3ad84 100644
> --- a/fs/xfs/xfs_qm_syscalls.c
> +++ b/fs/xfs/xfs_qm_syscalls.c
> @@ -411,20 +411,12 @@ xfs_qm_scall_getqstat(
>  	memset(out, 0, sizeof(fs_quota_stat_t));
>  
>  	out->qs_version = FS_QSTAT_VERSION;
> -	if (!xfs_sb_version_hasquota(&mp->m_sb)) {
> -		out->qs_uquota.qfs_ino = NULLFSINO;
> -		out->qs_gquota.qfs_ino = NULLFSINO;
> -		return 0;
> -	}
> -
>  	out->qs_flags = (__uint16_t) xfs_qm_export_flags(mp->m_qflags &
>  							(XFS_ALL_QUOTA_ACCT|
>  							 XFS_ALL_QUOTA_ENFD));
> -	if (q) {
> -		uip = q->qi_uquotaip;
> -		gip = q->qi_gquotaip;
> -		pip = q->qi_pquotaip;
> -	}
> +	uip = q->qi_uquotaip;
> +	gip = q->qi_gquotaip;
> +	pip = q->qi_pquotaip;
>  	if (!uip && mp->m_sb.sb_uquotino != NULLFSINO) {
>  		if (xfs_iget(mp, NULL, mp->m_sb.sb_uquotino,
>  					0, 0, &uip) == 0)
> @@ -470,14 +462,13 @@ xfs_qm_scall_getqstat(
>  		if (temppqip)
>  			IRELE(pip);
>  	}
> -	if (q) {
> -		out->qs_incoredqs = q->qi_dquots;
> -		out->qs_btimelimit = q->qi_btimelimit;
> -		out->qs_itimelimit = q->qi_itimelimit;
> -		out->qs_rtbtimelimit = q->qi_rtbtimelimit;
> -		out->qs_bwarnlimit = q->qi_bwarnlimit;
> -		out->qs_iwarnlimit = q->qi_iwarnlimit;
> -	}
> +	out->qs_incoredqs = q->qi_dquots;
> +	out->qs_btimelimit = q->qi_btimelimit;
> +	out->qs_itimelimit = q->qi_itimelimit;
> +	out->qs_rtbtimelimit = q->qi_rtbtimelimit;
> +	out->qs_bwarnlimit = q->qi_bwarnlimit;
> +	out->qs_iwarnlimit = q->qi_iwarnlimit;
> +
>  	return 0;
>  }
>  
> @@ -498,13 +489,6 @@ xfs_qm_scall_getqstatv(
>  	bool                    tempgqip = false;
>  	bool                    temppqip = false;
>  
> -	if (!xfs_sb_version_hasquota(&mp->m_sb)) {
> -		out->qs_uquota.qfs_ino = NULLFSINO;
> -		out->qs_gquota.qfs_ino = NULLFSINO;
> -		out->qs_pquota.qfs_ino = NULLFSINO;
> -		return 0;
> -	}
> -
>  	out->qs_flags = (__uint16_t) xfs_qm_export_flags(mp->m_qflags &
>  							(XFS_ALL_QUOTA_ACCT|
>  							 XFS_ALL_QUOTA_ENFD));
> @@ -512,11 +496,9 @@ xfs_qm_scall_getqstatv(
>  	out->qs_gquota.qfs_ino = mp->m_sb.sb_gquotino;
>  	out->qs_pquota.qfs_ino = mp->m_sb.sb_pquotino;
>  
> -	if (q) {
> -		uip = q->qi_uquotaip;
> -		gip = q->qi_gquotaip;
> -		pip = q->qi_pquotaip;
> -	}
> +	uip = q->qi_uquotaip;
> +	gip = q->qi_gquotaip;
> +	pip = q->qi_pquotaip;
>  	if (!uip && mp->m_sb.sb_uquotino != NULLFSINO) {
>  		if (xfs_iget(mp, NULL, mp->m_sb.sb_uquotino,
>  					0, 0, &uip) == 0)
> @@ -551,14 +533,13 @@ xfs_qm_scall_getqstatv(
>  		if (temppqip)
>  			IRELE(pip);
>  	}
> -	if (q) {
> -		out->qs_incoredqs = q->qi_dquots;
> -		out->qs_btimelimit = q->qi_btimelimit;
> -		out->qs_itimelimit = q->qi_itimelimit;
> -		out->qs_rtbtimelimit = q->qi_rtbtimelimit;
> -		out->qs_bwarnlimit = q->qi_bwarnlimit;
> -		out->qs_iwarnlimit = q->qi_iwarnlimit;
> -	}
> +	out->qs_incoredqs = q->qi_dquots;
> +	out->qs_btimelimit = q->qi_btimelimit;
> +	out->qs_itimelimit = q->qi_itimelimit;
> +	out->qs_rtbtimelimit = q->qi_rtbtimelimit;
> +	out->qs_bwarnlimit = q->qi_bwarnlimit;
> +	out->qs_iwarnlimit = q->qi_iwarnlimit;
> +
>  	return 0;
>  }
>  
> -- 
> 2.1.2
> 
> _______________________________________________
> 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