xfs
[Top] [All Lists]

Re: [PATCH 3/3] xfs: set buf types when converting extent formats

To: Dave Chinner <david@xxxxxxxxxxxxx>
Subject: Re: [PATCH 3/3] xfs: set buf types when converting extent formats
From: Brian Foster <bfoster@xxxxxxxxxx>
Date: Wed, 21 Jan 2015 17:06:09 -0500
Cc: xfs@xxxxxxxxxxx, jack@xxxxxxx
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1421800780-26008-4-git-send-email-david@xxxxxxxxxxxxx>
References: <1421800780-26008-1-git-send-email-david@xxxxxxxxxxxxx> <1421800780-26008-4-git-send-email-david@xxxxxxxxxxxxx>
User-agent: Mutt/1.5.23 (2014-03-12)
On Wed, Jan 21, 2015 at 11:39:40AM +1100, Dave Chinner wrote:
> From: Dave Chinner <dchinner@xxxxxxxxxx>
> 
> Conversion from local to extent format does not set the buffer type
> correctly on the new extent buffer when a symlink data is moved out
> of line.
> 
> Fix the symlink code and leave a comment in the generic bmap code
> reminding us that the format-specific data copy needs to set the
> destination buffer type appropriately.
> 
> Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
> ---

Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>

>  fs/xfs/libxfs/xfs_bmap.c           | 6 +++++-
>  fs/xfs/libxfs/xfs_symlink_remote.c | 2 ++
>  2 files changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index 63a5bb9..61ec015 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -973,7 +973,11 @@ xfs_bmap_local_to_extents(
>       *firstblock = args.fsbno;
>       bp = xfs_btree_get_bufl(args.mp, tp, args.fsbno, 0);
>  
> -     /* initialise the block and copy the data */
> +     /*
> +      * Initialise the block and copy the data
> +      *
> +      * Note: init_fn must set the buffer log item type correctly!
> +      */
>       init_fn(tp, bp, ip, ifp);
>  
>       /* account for the change in fork size and log everything */
> diff --git a/fs/xfs/libxfs/xfs_symlink_remote.c 
> b/fs/xfs/libxfs/xfs_symlink_remote.c
> index c80c523..e7e26bd 100644
> --- a/fs/xfs/libxfs/xfs_symlink_remote.c
> +++ b/fs/xfs/libxfs/xfs_symlink_remote.c
> @@ -178,6 +178,8 @@ xfs_symlink_local_to_remote(
>       struct xfs_mount        *mp = ip->i_mount;
>       char                    *buf;
>  
> +     xfs_trans_buf_set_type(tp, bp, XFS_BLFT_SYMLINK_BUF);
> +
>       if (!xfs_sb_version_hascrc(&mp->m_sb)) {
>               bp->b_ops = NULL;
>               memcpy(bp->b_addr, ifp->if_u1.if_data, ifp->if_bytes);
> -- 
> 2.0.0
> 
> _______________________________________________
> xfs mailing list
> xfs@xxxxxxxxxxx
> http://oss.sgi.com/mailman/listinfo/xfs

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