diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-06-23 08:49:01 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-06-23 08:49:01 +1000 |
| commit | de50e16ffabf64d30ca9372f39dc855a7553e305 (patch) | |
| tree | 08b926c00c75fde21823ee8279ce1473546d1356 /fs/xfs/xfs_inode.c | |
| parent | 3d238b7e0efc2d9dde7513298ef32da289a6a0f4 (diff) | |
| parent | f66bf042693b620133d39af8d2f13615f03eadfc (diff) | |
| download | op-kernel-dev-de50e16ffabf64d30ca9372f39dc855a7553e305.zip op-kernel-dev-de50e16ffabf64d30ca9372f39dc855a7553e305.tar.gz | |
Merge branch 'xfs-misc-fixes-for-4.2-3' into for-next
Diffstat (limited to 'fs/xfs/xfs_inode.c')
| -rw-r--r-- | fs/xfs/xfs_inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index a37a101..3da9f4d 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -3392,7 +3392,7 @@ xfs_iflush_int( ASSERT(ip->i_d.di_version > 1); /* set *dip = inode's place in the buffer */ - dip = (xfs_dinode_t *)xfs_buf_offset(bp, ip->i_imap.im_boffset); + dip = xfs_buf_offset(bp, ip->i_imap.im_boffset); if (XFS_TEST_ERROR(dip->di_magic != cpu_to_be16(XFS_DINODE_MAGIC), mp, XFS_ERRTAG_IFLUSH_1, XFS_RANDOM_IFLUSH_1)) { |
