diff options
| author | Dave Chinner <dchinner@redhat.com> | 2014-10-02 01:05:05 +0200 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-10-02 01:05:05 +0200 |
| commit | 8b131973d1628f1a0c5a36fe02269d696bbe60a3 (patch) | |
| tree | 93c8b5b454614462911717065bd84e4caf178091 /fs/xfs/xfs_trans_buf.c | |
| parent | xfs: xfs_bioerror can die. (diff) | |
| download | linux-8b131973d1628f1a0c5a36fe02269d696bbe60a3.tar.xz linux-8b131973d1628f1a0c5a36fe02269d696bbe60a3.zip | |
xfs: kill xfs_bioerror_relse
There is only one caller now - xfs_trans_read_buf_map() - and it has
very well defined call semantics - read, synchronous, and b_iodone
is NULL. Hence it's pretty clear what error handling is necessary
for this case. The bigger problem of untangling
xfs_trans_read_buf_map error handling is left to a future patch.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs/xfs_trans_buf.c')
| -rw-r--r-- | fs/xfs/xfs_trans_buf.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/xfs/xfs_trans_buf.c b/fs/xfs/xfs_trans_buf.c index 96c898e7ac9a..db4be5b1d732 100644 --- a/fs/xfs/xfs_trans_buf.c +++ b/fs/xfs/xfs_trans_buf.c @@ -324,11 +324,14 @@ xfs_trans_read_buf_map( */ if (XFS_FORCED_SHUTDOWN(mp)) { trace_xfs_bdstrat_shut(bp, _RET_IP_); - xfs_bioerror_relse(bp); - } else { - xfs_buf_iorequest(bp); + bp->b_flags &= ~(XBF_READ | XBF_DONE); + xfs_buf_ioerror(bp, -EIO); + xfs_buf_stale(bp); + xfs_buf_relse(bp); + return -EIO; } + xfs_buf_iorequest(bp); error = xfs_buf_iowait(bp); if (error) { xfs_buf_ioerror_alert(bp, __func__); |