Skip to contentSkip to conversation

fix up xfsbdstrat b0rkage

PATCH In review David Chinner 2 participants 2 messages Apr 10, 2008 XFS filesystem

lore
Share & tools
lore

David Chinner

author
#0 lore raw

PATCH 1/1 fix up xfsbdstrat b0rkage

Not sure how this got through testing, but it's screwed.

---

Don't error out on good I/Os in xfsbdstrat().

Signed-off-by Dave Chinner <[email protected]>
---
 fs/xfs/linux-2.6/xfs_lrw.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
fs/xfs/linux-2.6/xfs_lrw.c +3 -1
Index: 2.6.x-xfs-new/fs/xfs/linux-2.6/xfs_lrw.c
===================================================================
@@ -885,8 +885,10 @@ xfsbdstrat(
 	struct xfs_buf		*bp)
 {
 	ASSERT(mp);
-	if (!XFS_FORCED_SHUTDOWN(mp))
+	if (!XFS_FORCED_SHUTDOWN(mp)) {
 		xfs_buf_iorequest(bp);
+		return;
+	}
 
 	xfs_buftrace("XFSBDSTRAT IOERROR", bp);
 	xfs_bioerror_relse(bp);
#1 lore raw
Quoted 17 lines · David Chinner

Not sure how this got through testing, but it's screwed.

---

Don't error out on good I/Os in xfsbdstrat().

Signed-off-by Dave Chinner <[email protected]>
---
 fs/xfs/linux-2.6/xfs_lrw.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: 2.6.x-xfs-new/fs/xfs/linux-2.6/xfs_lrw.c
===================================================================

fs/xfs/linux-2.6/xfs_lrw.c +0 -0
@@ -885,8 +885,10 @@ xfsbdstrat(
 	struct xfs_buf		*bp)

fs/xfs/linux-2.6/xfs_lrw.c xfsbdstrat( · line 894

Quoted 10 lines
fs/xfs/linux-2.6/xfs_lrw.c +3 -1
 {
 	ASSERT(mp);
-	if (!XFS_FORCED_SHUTDOWN(mp))
+	if (!XFS_FORCED_SHUTDOWN(mp)) {
 		xfs_buf_iorequest(bp);
+		return;
+	}
 
 	xfs_buftrace("XFSBDSTRAT IOERROR", bp);
 	xfs_bioerror_relse(bp);

Looks good Dave,

Don