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 94acab23fc914f84d579a5ba1d4bd9b4f02093a8..d6610f2711dea0fc6381157c37ca60161972da83 100644 (file)
--- 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;