diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-01-22 01:51:30 +0300 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-01-22 01:51:30 +0300 |
| commit | 438c3c8d2bb910966db6fc4140e62d67b3c5f2a8 (patch) | |
| tree | c44fbb5488a82a24b3d71c4fe19924c2dc97df0e /fs/xfs/libxfs | |
| parent | 465e2def7cb45864da1f82afb973a6acd1046ed8 (diff) | |
| parent | 3443a3bca54588f43286b725d8648d33a38c86f1 (diff) | |
| download | linux-438c3c8d2bb910966db6fc4140e62d67b3c5f2a8.tar.xz | |
Merge branch 'xfs-buf-type-fixes' into for-next
Diffstat (limited to 'fs/xfs/libxfs')
| -rw-r--r-- | fs/xfs/libxfs/xfs_bmap.c | 6 | ||||
| -rw-r--r-- | fs/xfs/libxfs/xfs_symlink_remote.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index 63a5bb9113ee..61ec015dca16 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 c80c5236c3da..e7e26bd6468f 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); |