diff options
| author | Ben Myers <bpm@sgi.com> | 2013-12-18 17:36:58 +0100 |
|---|---|---|
| committer | Ben Myers <bpm@sgi.com> | 2013-12-18 17:36:58 +0100 |
| commit | 324bb26144e9be037227ff75fae1042d048a15b4 (patch) | |
| tree | c90ce3a7a9712884c5f36fa64b5c113f1e37f906 /fs/xfs/xfs_log_recover.c | |
| parent | Merge branch 'xfs-factor-icluster-macros' into for-next (diff) | |
| parent | xfs: abort metadata writeback on permanent errors (diff) | |
| download | linux-324bb26144e9be037227ff75fae1042d048a15b4.tar.xz linux-324bb26144e9be037227ff75fae1042d048a15b4.zip | |
Merge branch 'xfs-for-linus-v3.13-rc5' into for-next
Diffstat (limited to 'fs/xfs/xfs_log_recover.c')
| -rw-r--r-- | fs/xfs/xfs_log_recover.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index 22b6f35765c1..bce53ac81096 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c @@ -193,7 +193,10 @@ xlog_bread_noalign( bp->b_io_length = nbblks; bp->b_error = 0; - xfsbdstrat(log->l_mp, bp); + if (XFS_FORCED_SHUTDOWN(log->l_mp)) + return XFS_ERROR(EIO); + + xfs_buf_iorequest(bp); error = xfs_buf_iowait(bp); if (error) xfs_buf_ioerror_alert(bp, __func__); @@ -4408,7 +4411,13 @@ xlog_do_recover( XFS_BUF_READ(bp); XFS_BUF_UNASYNC(bp); bp->b_ops = &xfs_sb_buf_ops; - xfsbdstrat(log->l_mp, bp); + + if (XFS_FORCED_SHUTDOWN(log->l_mp)) { + xfs_buf_relse(bp); + return XFS_ERROR(EIO); + } + + xfs_buf_iorequest(bp); error = xfs_buf_iowait(bp); if (error) { xfs_buf_ioerror_alert(bp, __func__); |