diff options
author | Dave Chinner <dchinner@redhat.com> | 2014-06-06 08:02:12 +0200 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2014-06-06 08:02:12 +0200 |
commit | 36de95567f910f5544060f50346d8677ae13ad22 (patch) | |
tree | 072f4754d9b621182a4526e356cfeb03e6a4f605 /fs/xfs/xfs_buf.h | |
parent | xfs: xfs_readsb needs to check for magic numbers (diff) | |
download | linux-36de95567f910f5544060f50346d8677ae13ad22.tar.xz linux-36de95567f910f5544060f50346d8677ae13ad22.zip |
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.h')
-rw-r--r-- | fs/xfs/xfs_buf.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h index b8a3abf6cf47..a999a3941c81 100644 --- a/fs/xfs/xfs_buf.h +++ b/fs/xfs/xfs_buf.h @@ -298,11 +298,6 @@ extern void xfs_buf_iomove(xfs_buf_t *, size_t, size_t, void *, extern int xfs_bioerror_relse(struct xfs_buf *); -static inline int xfs_buf_geterror(xfs_buf_t *bp) -{ - return bp ? bp->b_error : ENOMEM; -} - /* Buffer Utility Routines */ extern xfs_caddr_t xfs_buf_offset(xfs_buf_t *, size_t); |