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_extfree_item.c | |
| parent | 3d238b7e0efc2d9dde7513298ef32da289a6a0f4 (diff) | |
| parent | f66bf042693b620133d39af8d2f13615f03eadfc (diff) | |
Merge branch 'xfs-misc-fixes-for-4.2-3' into for-nextxfs-for-linus-4.2-rc1
Diffstat (limited to 'fs/xfs/xfs_extfree_item.c')
| -rw-r--r-- | fs/xfs/xfs_extfree_item.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_extfree_item.c b/fs/xfs/xfs_extfree_item.c index cb7fe64cdbfa..adc8f8fdd145 100644 --- a/fs/xfs/xfs_extfree_item.c +++ b/fs/xfs/xfs_extfree_item.c @@ -239,7 +239,7 @@ xfs_efi_init( xfs_log_item_init(mp, &efip->efi_item, XFS_LI_EFI, &xfs_efi_item_ops); efip->efi_format.efi_nextents = nextents; - efip->efi_format.efi_id = (__psint_t)(void*)efip; + efip->efi_format.efi_id = (uintptr_t)(void *)efip; atomic_set(&efip->efi_next_extent, 0); atomic_set(&efip->efi_refcount, 2); |