diff options
author | Dave Chinner <david@fromorbit.com> | 2016-12-07 01:42:30 -0500 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2016-12-07 01:42:30 -0500 |
commit | a444d72e609062a040ed95a50e8fccfa1d58281b (patch) | |
tree | c57054f0e2674a9a80097e48a266c505c0cddca6 /fs/xfs/xfs_inode.c | |
parent | 5f1c6d28cfcd11c9df67dad45992fd523727fe1e (diff) | |
parent | 6031e73a5b3f85ec45cac08ef90995b2d3f941c7 (diff) |
Merge branch 'xfs-4.10-misc-fixes-3' into for-next
Diffstat (limited to 'fs/xfs/xfs_inode.c')
-rw-r--r-- | fs/xfs/xfs_inode.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index e9ab42d8965b..b9557795eb74 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c | |||
@@ -2032,7 +2032,6 @@ xfs_iunlink( | |||
2032 | agi->agi_unlinked[bucket_index] = cpu_to_be32(agino); | 2032 | agi->agi_unlinked[bucket_index] = cpu_to_be32(agino); |
2033 | offset = offsetof(xfs_agi_t, agi_unlinked) + | 2033 | offset = offsetof(xfs_agi_t, agi_unlinked) + |
2034 | (sizeof(xfs_agino_t) * bucket_index); | 2034 | (sizeof(xfs_agino_t) * bucket_index); |
2035 | xfs_trans_buf_set_type(tp, agibp, XFS_BLFT_AGI_BUF); | ||
2036 | xfs_trans_log_buf(tp, agibp, offset, | 2035 | xfs_trans_log_buf(tp, agibp, offset, |
2037 | (offset + sizeof(xfs_agino_t) - 1)); | 2036 | (offset + sizeof(xfs_agino_t) - 1)); |
2038 | return 0; | 2037 | return 0; |
@@ -2124,7 +2123,6 @@ xfs_iunlink_remove( | |||
2124 | agi->agi_unlinked[bucket_index] = cpu_to_be32(next_agino); | 2123 | agi->agi_unlinked[bucket_index] = cpu_to_be32(next_agino); |
2125 | offset = offsetof(xfs_agi_t, agi_unlinked) + | 2124 | offset = offsetof(xfs_agi_t, agi_unlinked) + |
2126 | (sizeof(xfs_agino_t) * bucket_index); | 2125 | (sizeof(xfs_agino_t) * bucket_index); |
2127 | xfs_trans_buf_set_type(tp, agibp, XFS_BLFT_AGI_BUF); | ||
2128 | xfs_trans_log_buf(tp, agibp, offset, | 2126 | xfs_trans_log_buf(tp, agibp, offset, |
2129 | (offset + sizeof(xfs_agino_t) - 1)); | 2127 | (offset + sizeof(xfs_agino_t) - 1)); |
2130 | } else { | 2128 | } else { |