xfs
[Top] [All Lists]

Re: [PATCH 01/10] xfs: remove duplicate code in xlog_cil_insert_format_i

To: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Subject: Re: [PATCH 01/10] xfs: remove duplicate code in xlog_cil_insert_format_items
From: Ben Myers <bpm@xxxxxxx>
Date: Mon, 9 Dec 2013 13:45:48 -0600
Cc: xfs@xxxxxxxxxxx
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <20131129084000.123386171@xxxxxxxxxxxxxxxxxxxxxx>
References: <20131129083919.207915844@xxxxxxxxxxxxxxxxxxxxxx> <20131129084000.123386171@xxxxxxxxxxxxxxxxxxxxxx>
User-agent: Mutt/1.5.20 (2009-06-14)
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@xxxxxx>
> ---
>  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

<Prev in Thread] Current Thread [Next in Thread>