From: Martin K. Petersen <martin.petersen@oracle.com>
Date: Wed, 27 May 2015 01:15:34 +0000 (-0400)
Subject: oracleasm: Fix occasional I/O stall due to merge error
X-Git-Tag: v4.1.12-92~323^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=885aaf8d914503acfd4a013151fa324a4bf25d1d;p=users%2Fjedix%2Flinux-maple.git

oracleasm: Fix occasional I/O stall due to merge error

Commit c05b6f12aae5 (oracleasm: Deprecate mlog and implement support for
tracepoints) inadvertently changed the maybe_wait_io logic so that we
would occasionally hang while waiting for I/O completion. Make sure we
only return when there is an actual error.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---

diff --git a/drivers/block/oracleasm/driver.c b/drivers/block/oracleasm/driver.c
index 94acab23fc914..d6610f2711dea 100644
--- a/drivers/block/oracleasm/driver.c
+++ b/drivers/block/oracleasm/driver.c
@@ -1357,7 +1357,8 @@ static int asm_maybe_wait_io(struct file *file,
 		remove_wait_queue(&afi->f_wait, &wait);
 		remove_wait_queue(&to->wait, &to_wait);
 
-		return ret;
+		if (ret)
+			return ret;
 	}
 
 	ret = 0;