From: Scott Bauer <scott.bauer@intel.com>
Date: Wed, 22 Feb 2017 17:15:08 +0000 (-0700)
Subject: block/sed-opal: Propagate original error message to userland.
X-Git-Tag: Ubuntu-4.11.0-0.5~543^2~3
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=2d19020b085eaf61d24377db27e8630cd9cff7ce;p=mirror_ubuntu-artful-kernel.git

block/sed-opal: Propagate original error message to userland.

During an error on a comannd, ex: user provides wrong pw to unlock
range, we will gracefully terminate the opal session. We want to
propagate the original error to userland instead of the result of
the session termination, which is almost always a success.

Signed-off-by: Scott Bauer <scott.bauer@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/block/sed-opal.c b/block/sed-opal.c
index 020bf3e28e38..1e18dca360fc 100644
--- a/block/sed-opal.c
+++ b/block/sed-opal.c
@@ -396,8 +396,11 @@ static int next(struct opal_dev *dev)
 			 * session. Therefore we shouldn't attempt to terminate
 			 * a session, as one has not yet been created.
 			 */
-			if (state > 1)
-				return end_opal_session_error(dev);
+			if (state > 1) {
+				end_opal_session_error(dev);
+				return error;
+			}
+
 		}
 		state++;
 	} while (!error);