aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_buf_item.c
diff options
context:
space:
mode:
authorDave Chinner <dchinner@redhat.com>2014-06-06 02:02:12 -0400
committerDave Chinner <david@fromorbit.com>2014-06-06 02:02:12 -0400
commit36de95567f910f5544060f50346d8677ae13ad22 (patch)
tree072f4754d9b621182a4526e356cfeb03e6a4f605 /fs/xfs/xfs_buf_item.c
parent556b8883cfac3d3203557e161ea8005f8b5479b2 (diff)
xfs: kill xfs_buf_geterror()
Most of the callers are just calling ASSERT(!xfs_buf_geterror()) which means they are checking for bp->b_error == 0. If bp is null in this case, we will assert fail, and hence it's no different in result to oopsing because of a null bp. In some cases, errors have already been checked for or the function returning the buffer can't return a buffer with an error, so it's just a redundant assert. Either way, the assert can either be removed. The other two non-assert callers can just test for a buffer and error properly. Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Dave Chinner <david@fromorbit.com>
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 8752821443be..941f6e984ac4 100644
--- a/fs/xfs/xfs_buf_item.c
+++ b/fs/xfs/xfs_buf_item.c
@@ -1053,7 +1053,7 @@ xfs_buf_iodone_callbacks(
1053 static ulong lasttime; 1053 static ulong lasttime;
1054 static xfs_buftarg_t *lasttarg; 1054 static xfs_buftarg_t *lasttarg;
1055 1055
1056 if (likely(!xfs_buf_geterror(bp))) 1056 if (likely(!bp->b_error))
1057 goto do_callbacks; 1057 goto do_callbacks;
1058 1058
1059 /* 1059 /*