public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Ben Myers <bpm@sgi.com>
To: Christoph Hellwig <hch@infradead.org>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH 01/10] xfs: remove duplicate code in xlog_cil_insert_format_items
Date: Mon, 9 Dec 2013 13:45:48 -0600	[thread overview]
Message-ID: <20131209194548.GX1935@sgi.com> (raw)
In-Reply-To: <20131129084000.123386171@bombadil.infradead.org>

Christoph,

On Fri, Nov 29, 2013 at 12:39:20AM -0800, Christoph Hellwig wrote:
> Share code that was previously duplicated in two branches.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  fs/xfs/xfs_log_cil.c |   33 +++++++++++++--------------------
>  1 file changed, 13 insertions(+), 20 deletions(-)
> 
> diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c
> index 5eb51fc..0a7a8ce 100644
> --- a/fs/xfs/xfs_log_cil.c
> +++ b/fs/xfs/xfs_log_cil.c
> @@ -254,29 +254,22 @@ xlog_cil_insert_format_items(
>  			 */
>  			*diff_iovecs -= lv->lv_niovecs;
>  			*diff_len -= lv->lv_buf_len;
> -
> -			/* Ensure the lv is set up according to ->iop_size */
> -			lv->lv_niovecs = niovecs;
> -			lv->lv_buf = (char *)lv + buf_size - nbytes;
> -
> -			lv->lv_buf_len = xlog_cil_lv_item_format(lip, lv);
> -			goto insert;
> +		} else {
> +			/* allocate new data chunk */
> +			lv = kmem_zalloc(buf_size, KM_SLEEP|KM_NOFS);
> +			lv->lv_item = lip;
> +			lv->lv_size = buf_size;
> +			if (ordered) {
> +				/* track as an ordered logvec */
> +				ASSERT(lip->li_lv == NULL);
> +				lv->lv_buf_len = XFS_LOG_VEC_ORDERED;
> +				goto insert;

It looks like lv->lv_niovecs is no longer being set in this case.  Was that intentional?

Thanks,
Ben

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

  parent reply	other threads:[~2013-12-09 19:45 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-29  8:39 [PATCH 00/10] decouple the in-memory from the on-disk log format V2 Christoph Hellwig
2013-11-29  8:39 ` [PATCH 01/10] xfs: remove duplicate code in xlog_cil_insert_format_items Christoph Hellwig
2013-12-03  0:58   ` Dave Chinner
2013-12-09 19:45   ` Ben Myers [this message]
2013-12-10 16:18     ` Christoph Hellwig
2013-11-29  8:39 ` [PATCH 02/10] xfs: refactor xfs_buf_item_format_segment Christoph Hellwig
2013-12-03  1:03   ` Dave Chinner
2013-11-29  8:39 ` [PATCH 03/10] xfs: refactor xfs_inode_item_size Christoph Hellwig
2013-12-03  1:06   ` Dave Chinner
2013-11-29  8:39 ` [PATCH 04/10] xfs: refactor xfs_inode_item_format Christoph Hellwig
2013-12-03  1:10   ` Dave Chinner
2013-11-29  8:39 ` [PATCH 05/10] xfs: introduce xlog_copy_iovec Christoph Hellwig
2013-12-03  1:21   ` Dave Chinner
2013-12-03  9:43     ` Christoph Hellwig
2013-11-29  8:39 ` [PATCH 06/10] xfs: format log items write directly into the linear CIL buffer Christoph Hellwig
2013-12-04  0:37   ` Dave Chinner
2013-12-09 19:00     ` Ben Myers
2013-12-10 16:12       ` Christoph Hellwig
2013-12-11 12:03   ` [PATCH 06/10 v2] " Christoph Hellwig
2013-12-12  0:05     ` Dave Chinner
2013-12-12 16:25     ` [PATCH 06/10 v3] " Christoph Hellwig
2013-11-29  8:39 ` [PATCH 07/10] xfs: format logged extents directly into the CIL Christoph Hellwig
2013-12-04  0:40   ` Dave Chinner
2013-11-29  8:39 ` [PATCH 08/10] xfs: remove the inode log format from the inode log item Christoph Hellwig
2013-12-04  0:44   ` Dave Chinner
2013-11-29  8:39 ` [PATCH 09/10] xfs: remove the dquot log format from the dquot " Christoph Hellwig
2013-12-04  0:47   ` Dave Chinner
2013-11-29  8:39 ` [PATCH 10/10] xfs: remove the quotaoff log format from the quotaoff " Christoph Hellwig
2013-12-04  0:49   ` 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=20131209194548.GX1935@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