diff options
author | Dave Chinner <david@fromorbit.com> | 2015-02-09 17:24:25 -0500 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2015-02-09 17:24:25 -0500 |
commit | bad962662dbc60e76ec1baae34af56b1ba2dfa5f (patch) | |
tree | bf6d56e8658ab5eceb6edec34d4f205f4217d23b /fs/xfs/xfs_trans_buf.c | |
parent | 179073620d8090e9c52bf203e2033fc9cfe088b3 (diff) | |
parent | e9892d3cc853afdda2cc69e2576d9ddb5fafad71 (diff) |
Merge branch 'xfs-misc-fixes-for-3.20-4' into for-next
Diffstat (limited to 'fs/xfs/xfs_trans_buf.c')
-rw-r--r-- | fs/xfs/xfs_trans_buf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/xfs/xfs_trans_buf.c b/fs/xfs/xfs_trans_buf.c index 0a4d4ab6d9a9..75798412859a 100644 --- a/fs/xfs/xfs_trans_buf.c +++ b/fs/xfs/xfs_trans_buf.c | |||
@@ -327,9 +327,10 @@ xfs_trans_read_buf_map( | |||
327 | return -EIO; | 327 | return -EIO; |
328 | } | 328 | } |
329 | 329 | ||
330 | if (tp) | 330 | if (tp) { |
331 | _xfs_trans_bjoin(tp, bp, 1); | 331 | _xfs_trans_bjoin(tp, bp, 1); |
332 | trace_xfs_trans_read_buf(bp->b_fspriv); | 332 | trace_xfs_trans_read_buf(bp->b_fspriv); |
333 | } | ||
333 | *bpp = bp; | 334 | *bpp = bp; |
334 | return 0; | 335 | return 0; |
335 | 336 | ||