diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-08-04 13:54:14 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-08-04 13:54:14 +1000 |
| commit | 4d7eece2c0dad832c5f224629eba3cced3f2d6cd (patch) | |
| tree | cddf541ea3c2860aaea0fed1f57871d310c3c14e /fs/xfs/libxfs/xfs_inode_fork.c | |
| parent | e0ac6d45bc52065d388b5aa153b58233af25a429 (diff) | |
| parent | d5cf09baced0ef3d2cc118865079f8b129e98e2f (diff) | |
| download | talos-obmc-linux-4d7eece2c0dad832c5f224629eba3cced3f2d6cd.tar.gz talos-obmc-linux-4d7eece2c0dad832c5f224629eba3cced3f2d6cd.zip | |
Merge branch 'xfs-misc-fixes-3.17-1' into for-next
Diffstat (limited to 'fs/xfs/libxfs/xfs_inode_fork.c')
| -rw-r--r-- | fs/xfs/libxfs/xfs_inode_fork.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/libxfs/xfs_inode_fork.c b/fs/xfs/libxfs/xfs_inode_fork.c index 8ac9411bcf2a..6a00f7fed69d 100644 --- a/fs/xfs/libxfs/xfs_inode_fork.c +++ b/fs/xfs/libxfs/xfs_inode_fork.c @@ -528,7 +528,7 @@ xfs_iroot_realloc( ifp->if_broot_bytes = (int)new_size; ASSERT(XFS_BMAP_BMDR_SPACE(ifp->if_broot) <= XFS_IFORK_SIZE(ip, whichfork)); - memmove(np, op, cur_max * (uint)sizeof(xfs_dfsbno_t)); + memmove(np, op, cur_max * (uint)sizeof(xfs_fsblock_t)); return; } @@ -575,7 +575,7 @@ xfs_iroot_realloc( ifp->if_broot_bytes); np = (char *)XFS_BMAP_BROOT_PTR_ADDR(mp, new_broot, 1, (int)new_size); - memcpy(np, op, new_max * (uint)sizeof(xfs_dfsbno_t)); + memcpy(np, op, new_max * (uint)sizeof(xfs_fsblock_t)); } kmem_free(ifp->if_broot); ifp->if_broot = new_broot; |
