aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Bauer <scott.bauer@intel.com>2017-02-22 12:15:08 -0500
committerJens Axboe <axboe@fb.com>2017-02-23 13:55:44 -0500
commit2d19020b085eaf61d24377db27e8630cd9cff7ce (patch)
tree6423a5ec0b75faf1975bfbe13147c4f0defdacb8
parente286bcfc59e01c2c57f2d79a46063c0bddb7a0d1 (diff)
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>
-rw-r--r--block/sed-opal.c7
1 files changed, 5 insertions, 2 deletions
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)
396 * session. Therefore we shouldn't attempt to terminate 396 * session. Therefore we shouldn't attempt to terminate
397 * a session, as one has not yet been created. 397 * a session, as one has not yet been created.
398 */ 398 */
399 if (state > 1) 399 if (state > 1) {
400 return end_opal_session_error(dev); 400 end_opal_session_error(dev);
401 return error;
402 }
403
401 } 404 }
402 state++; 405 state++;
403 } while (!error); 406 } while (!error);