All of lore.kernel.org
 help / color / mirror / Atom feed
From: Brian Foster <bfoster@redhat.com>
To: Jan Kara <jack@suse.cz>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH 3/3] xfs: Remove some pointless quota checks
Date: Thu, 15 Jan 2015 08:28:05 -0500	[thread overview]
Message-ID: <20150115132805.GC23696@bfoster.bfoster> (raw)
In-Reply-To: <1421317085-14350-4-git-send-email-jack@suse.cz>

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

      reply	other threads:[~2015-01-15 13:28 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-15 10:18 [PATCH 0/3] xfs: Quota related cleanups Jan Kara
2015-01-15 10:18 ` [PATCH 1/3] xfs: Remove useless test Jan Kara
2015-01-15 13:27   ` Brian Foster
2015-01-20 16:44     ` Jan Kara
2015-01-20 22:14       ` Dave Chinner
2015-01-20 22:35         ` Jan Kara
2015-01-20 23:14           ` Dave Chinner
2015-01-15 10:18 ` [PATCH 2/3] xfs: Remove some useless flags tests Jan Kara
2015-01-15 13:28   ` Brian Foster
2015-01-15 10:18 ` [PATCH 3/3] xfs: Remove some pointless quota checks Jan Kara
2015-01-15 13:28   ` Brian Foster [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150115132805.GC23696@bfoster.bfoster \
    --to=bfoster@redhat.com \
    --cc=jack@suse.cz \
    --cc=xfs@oss.sgi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.