Patch "dm: return correct error code in dm_resume()'s retry loop" has been added to the 4.4-stable tree
From: <gregkh@linuxfoundation.org>
Date: 2016-10-26 07:48:07
This is a note to let you know that I've just added the patch titled
dm: return correct error code in dm_resume()'s retry loop
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
dm-return-correct-error-code-in-dm_resume-s-retry-loop.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let [off-list ref] know about it.
From 8dc23658b7aaa8b6b0609c81c8ad75e98b612801 Mon Sep 17 00:00:00 2001
From: Minfei Huang <redacted>
Date: Tue, 6 Sep 2016 16:00:29 +0800
Subject: dm: return correct error code in dm_resume()'s retry loop
From: Minfei Huang <redacted>
commit 8dc23658b7aaa8b6b0609c81c8ad75e98b612801 upstream.
dm_resume() will return success (0) rather than -EINVAL if
!dm_suspended_md() upon retry within dm_resume().
Reset the error code at the start of dm_resume()'s retry loop.
Also, remove a useless assignment at the end of dm_resume().
Fixes: ffcc393641 ("dm: enhance internal suspend and resume interface")
Signed-off-by: Minfei Huang <redacted>
Signed-off-by: Mike Snitzer <redacted>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/md/dm.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c@@ -3250,10 +3250,11 @@ static int __dm_resume(struct mapped_dev int dm_resume(struct mapped_device *md) { - int r = -EINVAL; + int r; struct dm_table *map = NULL; retry: + r = -EINVAL; mutex_lock_nested(&md->suspend_lock, SINGLE_DEPTH_NESTING); if (!dm_suspended_md(md))
@@ -3277,8 +3278,6 @@ retry: goto out; clear_bit(DMF_SUSPENDED, &md->flags); - - r = 0; out: mutex_unlock(&md->suspend_lock);
Patches currently in stable-queue which might be from mnghuan@gmail.com are queue-4.4/dm-return-correct-error-code-in-dm_resume-s-retry-loop.patch