diff options
author | trasz <trasz@FreeBSD.org> | 2008-12-16 21:13:11 +0000 |
---|---|---|
committer | trasz <trasz@FreeBSD.org> | 2008-12-16 21:13:11 +0000 |
commit | b2515a861b17c67bef0ad8eb3e85cdaffe242388 (patch) | |
tree | 69e7de47346c349ddf6f303959a812bf891ea077 /sys/gnu/fs | |
parent | 4039bb7c824968c46ec054cb3ea586cc81de6623 (diff) | |
download | FreeBSD-src-b2515a861b17c67bef0ad8eb3e85cdaffe242388.zip FreeBSD-src-b2515a861b17c67bef0ad8eb3e85cdaffe242388.tar.gz |
According to phk@, VOP_STRATEGY should never, _ever_, return
anything other than 0. Make it so. This fixes
"panic: VOP_STRATEGY failed bp=0xc320dd90 vp=0xc3b9f648",
encountered when writing to an orphaned filesystem. Reason
for the panic was the following assert:
KASSERT(i == 0, ("VOP_STRATEGY failed bp=%p vp=%p", bp, bp->b_vp));
at vfs_bio:bufstrategy().
Reviewed by: scottl, phk
Approved by: rwatson (mentor)
Sponsored by: FreeBSD Foundation
Diffstat (limited to 'sys/gnu/fs')
-rw-r--r-- | sys/gnu/fs/ext2fs/ext2_vnops.c | 2 | ||||
-rw-r--r-- | sys/gnu/fs/reiserfs/reiserfs_vnops.c | 7 | ||||
-rw-r--r-- | sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/sys/gnu/fs/ext2fs/ext2_vnops.c b/sys/gnu/fs/ext2fs/ext2_vnops.c index f81d509..1b5023c 100644 --- a/sys/gnu/fs/ext2fs/ext2_vnops.c +++ b/sys/gnu/fs/ext2fs/ext2_vnops.c @@ -1399,7 +1399,7 @@ ext2_strategy(ap) bp->b_error = error; bp->b_ioflags |= BIO_ERROR; bufdone(bp); - return (error); + return (0); } if ((long)bp->b_blkno == -1) vfs_bio_clrbuf(bp); diff --git a/sys/gnu/fs/reiserfs/reiserfs_vnops.c b/sys/gnu/fs/reiserfs/reiserfs_vnops.c index e6323ea..12fe409 100644 --- a/sys/gnu/fs/reiserfs/reiserfs_vnops.c +++ b/sys/gnu/fs/reiserfs/reiserfs_vnops.c @@ -350,8 +350,13 @@ reiserfs_strategy(struct vop_strategy_args /* { bp->b_ioflags |= BIO_ERROR; } + if (error) { + bp->b_ioflags |= BIO_ERROR; + bp->b_error = error; + } + bufdone(bp); - return (error); + return (0); } /* diff --git a/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c b/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c index d0efcf2..6d8d4eb 100644 --- a/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c +++ b/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c @@ -1136,7 +1136,7 @@ _xfs_strategy( bp->b_error = error; bp->b_ioflags |= BIO_ERROR; bufdone(bp); - return (error); + return (0); } if ((long)bp->b_blkno == -1) vfs_bio_clrbuf(bp); |