diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-10-01 23:11:14 (GMT) |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-10-01 23:11:14 (GMT) |
| commit | 75e58ce4c8f354f1a68a8bb8a9692827cdaf3d21 (patch) | |
| tree | 4bbcd993a6e75d199c82958ffe15c0e0d03f4bbf /fs/xfs/xfs_trans_buf.c | |
| parent | bd438f825f7badafe56d117ed906488c8541f95f (diff) | |
| parent | 8c15612546bce1ecafb7dee3cce8a2a9b560e15e (diff) | |
| download | linux-75e58ce4c8f354f1a68a8bb8a9692827cdaf3d21.tar.xz | |
Merge branch 'xfs-buf-iosubmit' into for-next
Diffstat (limited to 'fs/xfs/xfs_trans_buf.c')
| -rw-r--r-- | fs/xfs/xfs_trans_buf.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/fs/xfs/xfs_trans_buf.c b/fs/xfs/xfs_trans_buf.c index 96c898e..e2b2216 100644 --- a/fs/xfs/xfs_trans_buf.c +++ b/fs/xfs/xfs_trans_buf.c @@ -318,20 +318,10 @@ xfs_trans_read_buf_map( XFS_BUF_READ(bp); bp->b_ops = ops; - /* - * XXX(hch): clean up the error handling here to be less - * of a mess.. - */ - if (XFS_FORCED_SHUTDOWN(mp)) { - trace_xfs_bdstrat_shut(bp, _RET_IP_); - xfs_bioerror_relse(bp); - } else { - xfs_buf_iorequest(bp); - } - - error = xfs_buf_iowait(bp); + error = xfs_buf_submit_wait(bp); if (error) { - xfs_buf_ioerror_alert(bp, __func__); + if (!XFS_FORCED_SHUTDOWN(mp)) + xfs_buf_ioerror_alert(bp, __func__); xfs_buf_relse(bp); /* * We can gracefully recover from most read |