From: Ben Myers <bpm@sgi.com>
To: Christoph Hellwig <hch@infradead.org>
Cc: xfs@oss.sgi.com
Subject: Re: [patch 18/19] xfs: kill xfs_qm_idtodq
Date: Thu, 15 Dec 2011 14:07:36 -0600 [thread overview]
Message-ID: <20111215200736.GL29840@sgi.com> (raw)
In-Reply-To: <20111206215855.775568812@bombadil.infradead.org>
On Tue, Dec 06, 2011 at 04:58:24PM -0500, Christoph Hellwig wrote:
> This function doesn't help the code flow, so merge the dquot allocation and
> transaction handling into xfs_qm_dqread.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> Reviewed-by: Dave Chinner <dchinner@redhat.com>
Looks good.
Reviewed-by: Ben Myers <bpm@sgi.com>
> ---
> fs/xfs/xfs_dquot.c | 137 +++++++++++++++++++----------------------------------
> 1 file changed, 50 insertions(+), 87 deletions(-)
>
> Index: xfs/fs/xfs/xfs_dquot.c
> ===================================================================
> --- xfs.orig/fs/xfs/xfs_dquot.c 2011-12-06 15:53:53.153697880 +0100
> +++ xfs/fs/xfs/xfs_dquot.c 2011-12-06 15:56:37.910367600 +0100
> @@ -550,36 +550,62 @@ xfs_qm_dqtobp(
> * Read in the ondisk dquot using dqtobp() then copy it to an incore version,
> * and release the buffer immediately.
> *
> + * If XFS_QMOPT_DQALLOC is set, allocate a dquot on disk if it needed.
> */
> -/* ARGSUSED */
> STATIC int
> xfs_qm_dqread(
> - xfs_trans_t **tpp,
> - xfs_dqid_t id,
> - xfs_dquot_t *dqp, /* dquot to get filled in */
> - uint flags)
> + struct xfs_mount *mp,
> + xfs_dqid_t id,
> + uint type,
> + uint flags,
> + struct xfs_dquot **O_dqpp)
> {
> - xfs_disk_dquot_t *ddqp;
> - xfs_buf_t *bp;
> - int error;
> - xfs_trans_t *tp;
> + struct xfs_dquot *dqp;
> + struct xfs_disk_dquot *ddqp;
> + struct xfs_buf *bp;
> + struct xfs_trans *tp = NULL;
> + int error;
> + int cancelflags = 0;
>
> - ASSERT(tpp);
> + dqp = xfs_qm_dqinit(mp, id, type);
>
> trace_xfs_dqread(dqp);
>
> + if (flags & XFS_QMOPT_DQALLOC) {
> + tp = xfs_trans_alloc(mp, XFS_TRANS_QM_DQALLOC);
> + error = xfs_trans_reserve(tp, XFS_QM_DQALLOC_SPACE_RES(mp),
> + XFS_WRITE_LOG_RES(mp) +
> + /*
> + * Round the chunklen up to the next multiple
> + * of 128 (buf log item chunk size)).
> + */
Thanks for the comment. ;)
> + BBTOB(mp->m_quotainfo->qi_dqchunklen) - 1 + 128,
> + 0,
> + XFS_TRANS_PERM_LOG_RES,
> + XFS_WRITE_LOG_COUNT);
> + if (error)
> + goto error1;
> + cancelflags = XFS_TRANS_RELEASE_LOG_RES;
> + }
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2011-12-15 20:07 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-06 21:58 [patch 00/19] Linux 3.3 patchqueue Christoph Hellwig
2011-12-06 21:58 ` [patch 01/19] xfs: remove the deprecated nodelaylog option Christoph Hellwig
2011-12-07 21:44 ` Ben Myers
2011-12-08 16:12 ` Christoph Hellwig
2011-12-08 16:14 ` Ben Myers
2011-12-06 21:58 ` [patch 02/19] xfs: cleanup the transaction commit path a bit Christoph Hellwig
2011-12-08 17:44 ` Ben Myers
2011-12-06 21:58 ` [patch 03/19] xfs: remove the lid_size field in struct log_item_desc Christoph Hellwig
2011-12-08 18:35 ` Ben Myers
2011-12-06 21:58 ` [patch 04/19] xfs: untange SYNC_WAIT and SYNC_TRYLOCK meanings for xfs_qm_dqflush Christoph Hellwig
2011-12-08 21:10 ` Ben Myers
2011-12-06 21:58 ` [patch 05/19] xfs: make sure to really flush all dquots in xfs_qm_quotacheck Christoph Hellwig
2011-12-08 21:36 ` Ben Myers
2011-12-06 21:58 ` [patch 06/19] xfs: remove xfs_qm_sync Christoph Hellwig
2011-12-12 18:25 ` Ben Myers
2011-12-06 21:58 ` [patch 07/19] xfs: remove the sync_mode argument to xfs_qm_dqflush_all Christoph Hellwig
2011-12-12 22:33 ` Ben Myers
2011-12-06 21:58 ` [patch 08/19] xfs: cleanup dquot locking helpers Christoph Hellwig
2011-12-12 23:12 ` Ben Myers
2011-12-06 21:58 ` [patch 09/19] xfs: cleanup xfs_qm_dqlookup Christoph Hellwig
2011-12-13 17:30 ` Ben Myers
2011-12-06 21:58 ` [patch 10/19] xfs: remove XFS_DQ_INACTIVE Christoph Hellwig
2011-12-13 20:26 ` Ben Myers
2011-12-06 21:58 ` [patch 11/19] xfs: implement lazy removal for the dquot freelist Christoph Hellwig
2011-12-14 22:13 ` Ben Myers
2011-12-06 21:58 ` [patch 12/19] xfs: flatten the dquot lock ordering Christoph Hellwig
2011-12-13 19:44 ` Dave Chinner
2011-12-14 22:18 ` Ben Myers
2011-12-15 3:13 ` Ben Myers
2011-12-06 21:58 ` [patch 13/19] xfs: nest qm_dqfrlist_lock inside the dquot qlock Christoph Hellwig
2011-12-15 3:02 ` Ben Myers
2011-12-06 21:58 ` [patch 14/19] xfs: simplify xfs_qm_dqattach_grouphint Christoph Hellwig
2011-12-15 4:55 ` Ben Myers
2011-12-06 21:58 ` [patch 15/19] xfs: simplify xfs_qm_detach_gdquots Christoph Hellwig
2011-12-15 16:43 ` Ben Myers
2011-12-16 0:48 ` Dave Chinner
2011-12-16 21:33 ` Ben Myers
2011-12-06 21:58 ` [patch 16/19] xfs: add a xfs_dqhold helper Christoph Hellwig
2011-12-15 16:56 ` Ben Myers
2011-12-06 21:58 ` [patch 17/19] xfs: merge xfs_qm_dqinit_core into the only caller Christoph Hellwig
2011-12-15 17:00 ` Ben Myers
2011-12-06 21:58 ` [patch 18/19] xfs: kill xfs_qm_idtodq Christoph Hellwig
2011-12-15 20:07 ` Ben Myers [this message]
2011-12-06 21:58 ` [patch 19/19] xfs: remove XFS_QMOPT_DQSUSER Christoph Hellwig
2011-12-15 20:22 ` Ben Myers
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=20111215200736.GL29840@sgi.com \
--to=bpm@sgi.com \
--cc=hch@infradead.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox