Index: share/man/man9/VOP_STRATEGY.9
===================================================================
--- share/man/man9/VOP_STRATEGY.9	(revision 186188)
+++ share/man/man9/VOP_STRATEGY.9	(working copy)
@@ -53,7 +53,9 @@
 .Pp
 The call may block.
 .Sh RETURN VALUES
-Zero is returned on success, otherwise an error is returned.
+Always zero.
+Errors should be signalled by setting BIO_ERROR on b_ioflags field in struct buf,
+and setting b_error to the appropriate errno value.
 .Sh SEE ALSO
 .\" .Xr buf 9 ,
 .Xr vnode 9
Index: sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c
===================================================================
--- sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c	(revision 186188)
+++ sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c	(working copy)
@@ -1136,7 +1136,7 @@
 			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);
Index: sys/gnu/fs/reiserfs/reiserfs_vnops.c
===================================================================
--- sys/gnu/fs/reiserfs/reiserfs_vnops.c	(revision 186188)
+++ sys/gnu/fs/reiserfs/reiserfs_vnops.c	(working copy)
@@ -350,8 +350,13 @@
 		bp->b_ioflags |= BIO_ERROR;
 	}
 
+	if (error) {
+		bp->b_ioflags |= BIO_ERROR;
+		bp->b_error = error;
+	}
+
 	bufdone(bp);
-	return (error);
+	return (0);
 }
 
 /*
Index: sys/gnu/fs/ext2fs/ext2_vnops.c
===================================================================
--- sys/gnu/fs/ext2fs/ext2_vnops.c	(revision 186188)
+++ sys/gnu/fs/ext2fs/ext2_vnops.c	(working copy)
@@ -1399,7 +1399,7 @@
 			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);
Index: sys/ufs/ufs/ufs_vnops.c
===================================================================
--- sys/ufs/ufs/ufs_vnops.c	(revision 186188)
+++ sys/ufs/ufs/ufs_vnops.c	(working copy)
@@ -2013,7 +2013,7 @@
 			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);
Index: sys/fs/hpfs/hpfs_vnops.c
===================================================================
--- sys/fs/hpfs/hpfs_vnops.c	(revision 186188)
+++ sys/fs/hpfs/hpfs_vnops.c	(working copy)
@@ -661,7 +661,7 @@
 			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);
Index: sys/fs/smbfs/smbfs_vnops.c
===================================================================
--- sys/fs/smbfs/smbfs_vnops.c	(revision 186188)
+++ sys/fs/smbfs/smbfs_vnops.c	(working copy)
@@ -864,7 +864,7 @@
 
 	if ((bp->b_flags & B_ASYNC) == 0 )
 		error = smbfs_doio(ap->a_vp, bp, cr, td);
-	return error;
+	return (0);
 }
 
 int
Index: sys/fs/ntfs/ntfs_vnops.c
===================================================================
--- sys/fs/ntfs/ntfs_vnops.c	(revision 186188)
+++ sys/fs/ntfs/ntfs_vnops.c	(working copy)
@@ -339,7 +339,7 @@
 		}
 	}
 	bufdone(bp);
-	return (error);
+	return (0);
 }
 
 static int
Index: sys/fs/nwfs/nwfs_vnops.c
===================================================================
--- sys/fs/nwfs/nwfs_vnops.c	(revision 186188)
+++ sys/fs/nwfs/nwfs_vnops.c	(working copy)
@@ -804,7 +804,7 @@
 	 */
 	if ((bp->b_flags & B_ASYNC) == 0 )
 		error = nwfs_doio(ap->a_vp, bp, cr, td);
-	return (error);
+	return (0);
 }
 
 
Index: sys/fs/msdosfs/msdosfs_vnops.c
===================================================================
--- sys/fs/msdosfs/msdosfs_vnops.c	(revision 186188)
+++ sys/fs/msdosfs/msdosfs_vnops.c	(working copy)
@@ -1880,7 +1880,7 @@
 			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);