diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-12 15:28:02 +1100 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-12 15:28:02 +1100 |
| commit | 4d9d4ebf5de848e3450e23e4db9ac74e23e5daa6 (patch) | |
| tree | 2c6d2766054a925a42c1863e91fb5b8c6d0eb5cb /fs/xfs/linux-2.6/xfs_lrw.c | |
| parent | cfbe52672fbc6f333892e8dde82c35e0a76aa5f5 (diff) | |
| parent | c4cd747ee6c3ba1e7727878e3fce482d0d8c0136 (diff) | |
| download | kernel-crypto-4d9d4ebf5de848e3450e23e4db9ac74e23e5daa6.tar.gz kernel-crypto-4d9d4ebf5de848e3450e23e4db9ac74e23e5daa6.tar.xz kernel-crypto-4d9d4ebf5de848e3450e23e4db9ac74e23e5daa6.zip | |
Merge branch 'master' of git+ssh://git.melbourne.sgi.com/git/xfs
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_lrw.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_lrw.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/fs/xfs/linux-2.6/xfs_lrw.c b/fs/xfs/linux-2.6/xfs_lrw.c index 59b7d5f9e64..92ce34b3787 100644 --- a/fs/xfs/linux-2.6/xfs_lrw.c +++ b/fs/xfs/linux-2.6/xfs_lrw.c @@ -847,13 +847,7 @@ retry: int xfs_bdstrat_cb(struct xfs_buf *bp) { - xfs_mount_t *mp; - - mp = XFS_BUF_FSPRIVATE3(bp, xfs_mount_t *); - if (!XFS_FORCED_SHUTDOWN(mp)) { - xfs_buf_iorequest(bp); - return 0; - } else { + if (XFS_FORCED_SHUTDOWN(bp->b_mount)) { xfs_buftrace("XFS__BDSTRAT IOERROR", bp); /* * Metadata write that didn't get logged but @@ -866,6 +860,9 @@ xfs_bdstrat_cb(struct xfs_buf *bp) else return (xfs_bioerror(bp)); } + + xfs_buf_iorequest(bp); + return 0; } /* |