From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Pavel Reichl <preichl@redhat.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v4 5/5] Replace function declartion by actual definition
Date: Tue, 12 Nov 2019 20:43:58 -0800 [thread overview]
Message-ID: <20191113044358.GL6219@magnolia> (raw)
In-Reply-To: <20191112213310.212925-6-preichl@redhat.com>
On Tue, Nov 12, 2019 at 10:33:10PM +0100, Pavel Reichl wrote:
The subject line is missing the usual 'xfs:'
OTOH this looks like a simple enough code move that I'll just fix it on
the way in.
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> Signed-off-by: Pavel Reichl <preichl@redhat.com>
> ---
> fs/xfs/xfs_qm_syscalls.c | 140 ++++++++++++++++++---------------------
> 1 file changed, 66 insertions(+), 74 deletions(-)
>
> diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
> index e685b9ae90b9..1ea82764bf89 100644
> --- a/fs/xfs/xfs_qm_syscalls.c
> +++ b/fs/xfs/xfs_qm_syscalls.c
> @@ -19,12 +19,72 @@
> #include "xfs_qm.h"
> #include "xfs_icache.h"
>
> -STATIC int xfs_qm_log_quotaoff(struct xfs_mount *mp,
> - struct xfs_qoff_logitem **qoffstartp,
> - uint flags);
> -STATIC int xfs_qm_log_quotaoff_end(struct xfs_mount *mp,
> - struct xfs_qoff_logitem *startqoff,
> - uint flags);
> +STATIC int
> +xfs_qm_log_quotaoff(
> + struct xfs_mount *mp,
> + struct xfs_qoff_logitem **qoffstartp,
> + uint flags)
> +{
> + struct xfs_trans *tp;
> + int error;
> + struct xfs_qoff_logitem *qoffi;
> +
> + *qoffstartp = NULL;
> +
> + error = xfs_trans_alloc(mp, &M_RES(mp)->tr_qm_quotaoff, 0, 0, 0, &tp);
> + if (error)
> + goto out;
> +
> + qoffi = xfs_trans_get_qoff_item(tp, NULL, flags & XFS_ALL_QUOTA_ACCT);
> + xfs_trans_log_quotaoff_item(tp, qoffi);
> +
> + spin_lock(&mp->m_sb_lock);
> + mp->m_sb.sb_qflags = (mp->m_qflags & ~(flags)) & XFS_MOUNT_QUOTA_ALL;
> + spin_unlock(&mp->m_sb_lock);
> +
> + xfs_log_sb(tp);
> +
> + /*
> + * We have to make sure that the transaction is secure on disk before we
> + * return and actually stop quota accounting. So, make it synchronous.
> + * We don't care about quotoff's performance.
> + */
> + xfs_trans_set_sync(tp);
> + error = xfs_trans_commit(tp);
> + if (error)
> + goto out;
> +
> + *qoffstartp = qoffi;
> +out:
> + return error;
> +}
> +
> +STATIC int
> +xfs_qm_log_quotaoff_end(
> + struct xfs_mount *mp,
> + struct xfs_qoff_logitem *startqoff,
> + uint flags)
> +{
> + struct xfs_trans *tp;
> + int error;
> + struct xfs_qoff_logitem *qoffi;
> +
> + error = xfs_trans_alloc(mp, &M_RES(mp)->tr_qm_equotaoff, 0, 0, 0, &tp);
> + if (error)
> + return error;
> +
> + qoffi = xfs_trans_get_qoff_item(tp, startqoff,
> + flags & XFS_ALL_QUOTA_ACCT);
> + xfs_trans_log_quotaoff_item(tp, qoffi);
> +
> + /*
> + * We have to make sure that the transaction is secure on disk before we
> + * return and actually stop quota accounting. So, make it synchronous.
> + * We don't care about quotoff's performance.
> + */
> + xfs_trans_set_sync(tp);
> + return xfs_trans_commit(tp);
> +}
>
> /*
> * Turn off quota accounting and/or enforcement for all udquots and/or
> @@ -541,74 +601,6 @@ xfs_qm_scall_setqlim(
> return error;
> }
>
> -STATIC int
> -xfs_qm_log_quotaoff_end(
> - struct xfs_mount *mp,
> - struct xfs_qoff_logitem *startqoff,
> - uint flags)
> -{
> - struct xfs_trans *tp;
> - int error;
> - struct xfs_qoff_logitem *qoffi;
> -
> - error = xfs_trans_alloc(mp, &M_RES(mp)->tr_qm_equotaoff, 0, 0, 0, &tp);
> - if (error)
> - return error;
> -
> - qoffi = xfs_trans_get_qoff_item(tp, startqoff,
> - flags & XFS_ALL_QUOTA_ACCT);
> - xfs_trans_log_quotaoff_item(tp, qoffi);
> -
> - /*
> - * We have to make sure that the transaction is secure on disk before we
> - * return and actually stop quota accounting. So, make it synchronous.
> - * We don't care about quotoff's performance.
> - */
> - xfs_trans_set_sync(tp);
> - return xfs_trans_commit(tp);
> -}
> -
> -
> -STATIC int
> -xfs_qm_log_quotaoff(
> - struct xfs_mount *mp,
> - struct xfs_qoff_logitem **qoffstartp,
> - uint flags)
> -{
> - struct xfs_trans *tp;
> - int error;
> - struct xfs_qoff_logitem *qoffi;
> -
> - *qoffstartp = NULL;
> -
> - error = xfs_trans_alloc(mp, &M_RES(mp)->tr_qm_quotaoff, 0, 0, 0, &tp);
> - if (error)
> - goto out;
> -
> - qoffi = xfs_trans_get_qoff_item(tp, NULL, flags & XFS_ALL_QUOTA_ACCT);
> - xfs_trans_log_quotaoff_item(tp, qoffi);
> -
> - spin_lock(&mp->m_sb_lock);
> - mp->m_sb.sb_qflags = (mp->m_qflags & ~(flags)) & XFS_MOUNT_QUOTA_ALL;
> - spin_unlock(&mp->m_sb_lock);
> -
> - xfs_log_sb(tp);
> -
> - /*
> - * We have to make sure that the transaction is secure on disk before we
> - * return and actually stop quota accounting. So, make it synchronous.
> - * We don't care about quotoff's performance.
> - */
> - xfs_trans_set_sync(tp);
> - error = xfs_trans_commit(tp);
> - if (error)
> - goto out;
> -
> - *qoffstartp = qoffi;
> -out:
> - return error;
> -}
> -
> /* Fill out the quota context. */
> static void
> xfs_qm_scall_getquota_fill_qc(
> --
> 2.23.0
>
next prev parent reply other threads:[~2019-11-13 4:44 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-12 21:33 [PATCH v4 0/5] xfs: remove several typedefs in quota code Pavel Reichl
2019-11-12 21:33 ` [PATCH v4 1/5] xfs: remove the xfs_disk_dquot_t and xfs_dquot_t Pavel Reichl
2019-11-13 4:45 ` Darrick J. Wong
2019-11-14 1:29 ` Dave Chinner
2019-11-12 21:33 ` [PATCH v4 2/5] xfs: remove the xfs_quotainfo_t typedef Pavel Reichl
2019-11-13 4:44 ` Darrick J. Wong
2019-11-12 21:33 ` [PATCH v4 3/5] xfs: remove the xfs_dq_logitem_t typedef Pavel Reichl
2019-11-13 4:44 ` Darrick J. Wong
2019-11-14 1:30 ` Dave Chinner
2019-11-14 5:30 ` Pavel Reichl
2019-11-14 22:20 ` Dave Chinner
2019-11-12 21:33 ` [PATCH v4 4/5] xfs: remove the xfs_qoff_logitem_t typedef Pavel Reichl
2019-11-13 4:44 ` Darrick J. Wong
2019-11-14 1:38 ` Dave Chinner
2019-11-14 4:02 ` Darrick J. Wong
2019-11-12 21:33 ` [PATCH v4 5/5] Replace function declartion by actual definition Pavel Reichl
2019-11-13 4:43 ` Darrick J. Wong [this message]
2019-11-14 1:40 ` Dave Chinner
2019-11-14 1:28 ` [PATCH v4 0/5] xfs: remove several typedefs in quota code Dave Chinner
2019-11-14 5:25 ` Pavel Reichl
2019-11-15 0:21 ` Dave Chinner
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=20191113044358.GL6219@magnolia \
--to=darrick.wong@oracle.com \
--cc=linux-xfs@vger.kernel.org \
--cc=preichl@redhat.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).