summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_buf_item.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2014-06-10 07:32:56 +1000
committerDave Chinner <david@fromorbit.com>2014-06-10 07:32:56 +1000
commit7691283d0561a350b7517be94818669fb5e3d910 (patch)
tree3b939ee86e763c22c6ead988bf62de58e1981915 /fs/xfs/xfs_buf_item.c
parent8612c7e594808e4a67bc2d4661f5925df2be3f51 (diff)
parent30265117ee1e23fa91920f337a3ea91207f700dc (diff)
downloadlinux-7691283d0561a350b7517be94818669fb5e3d910.tar.bz2
Merge branch 'xfs-misc-fixes-3-for-3.16' into for-next
Diffstat (limited to 'fs/xfs/xfs_buf_item.c')
-rw-r--r--fs/xfs/xfs_buf_item.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
index 64b17f5bed9a..4654338b03fc 100644
--- a/fs/xfs/xfs_buf_item.c
+++ b/fs/xfs/xfs_buf_item.c
@@ -1052,7 +1052,7 @@ xfs_buf_iodone_callbacks(
static ulong lasttime;
static xfs_buftarg_t *lasttarg;
- if (likely(!xfs_buf_geterror(bp)))
+ if (likely(!bp->b_error))
goto do_callbacks;
/*