diff options
| author | Ben Myers <bpm@sgi.com> | 2013-12-18 16:36:58 (GMT) |
|---|---|---|
| committer | Ben Myers <bpm@sgi.com> | 2013-12-18 16:36:58 (GMT) |
| commit | 324bb26144e9be037227ff75fae1042d048a15b4 (patch) | |
| tree | c90ce3a7a9712884c5f36fa64b5c113f1e37f906 /fs/xfs/xfs_bmap_util.c | |
| parent | 46f23adf78545c49591619a615edeec41ed5a549 (diff) | |
| parent | ac8809f9ab01a73de1a47b5a37bd8dcca8712fb3 (diff) | |
| download | linux-324bb26144e9be037227ff75fae1042d048a15b4.tar.xz | |
Merge branch 'xfs-for-linus-v3.13-rc5' into for-next
Diffstat (limited to 'fs/xfs/xfs_bmap_util.c')
| -rw-r--r-- | fs/xfs/xfs_bmap_util.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c index 5887e41..1394106 100644 --- a/fs/xfs/xfs_bmap_util.c +++ b/fs/xfs/xfs_bmap_util.c @@ -1187,7 +1187,12 @@ xfs_zero_remaining_bytes( XFS_BUF_UNWRITE(bp); XFS_BUF_READ(bp); XFS_BUF_SET_ADDR(bp, xfs_fsb_to_db(ip, imap.br_startblock)); - xfsbdstrat(mp, bp); + + if (XFS_FORCED_SHUTDOWN(mp)) { + error = XFS_ERROR(EIO); + break; + } + xfs_buf_iorequest(bp); error = xfs_buf_iowait(bp); if (error) { xfs_buf_ioerror_alert(bp, @@ -1200,7 +1205,12 @@ xfs_zero_remaining_bytes( XFS_BUF_UNDONE(bp); XFS_BUF_UNREAD(bp); XFS_BUF_WRITE(bp); - xfsbdstrat(mp, bp); + + if (XFS_FORCED_SHUTDOWN(mp)) { + error = XFS_ERROR(EIO); + break; + } + xfs_buf_iorequest(bp); error = xfs_buf_iowait(bp); if (error) { xfs_buf_ioerror_alert(bp, |