diff options
author | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
commit | ee3e542fec6e69bc9fb668698889a37d93950ddf (patch) | |
tree | e74ee766a4764769ef1d3d45d266b4dea64101d3 /fs/xfs/xfs_fsops.c | |
parent | fe2a801b50c0bb8039d627e5ae1fec249d10ff39 (diff) | |
parent | f1d6e17f540af37bb1891480143669ba7636c4cf (diff) |
Merge remote-tracking branch 'linus/master' into testing
Diffstat (limited to 'fs/xfs/xfs_fsops.c')
-rw-r--r-- | fs/xfs/xfs_fsops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c index 3c3644ea825b..614eb0cc3608 100644 --- a/fs/xfs/xfs_fsops.c +++ b/fs/xfs/xfs_fsops.c | |||
@@ -176,7 +176,7 @@ xfs_growfs_data_private( | |||
176 | if (!bp) | 176 | if (!bp) |
177 | return EIO; | 177 | return EIO; |
178 | if (bp->b_error) { | 178 | if (bp->b_error) { |
179 | int error = bp->b_error; | 179 | error = bp->b_error; |
180 | xfs_buf_relse(bp); | 180 | xfs_buf_relse(bp); |
181 | return error; | 181 | return error; |
182 | } | 182 | } |