[PATCH] dm: Return correct value in retry loop

From: Minfei Huang
Date: Tue Sep 06 2016 - 05:10:06 EST


dm_resume will return sliently in retry loop's failure. Assign a correct
return value in the failed loop.

Remove a useless assignment as well.

Signed-off-by: Minfei Huang <mnghuan@xxxxxxxxx>
---
drivers/md/dm.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index fa9b1cb..c935cc8 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -2249,10 +2249,11 @@ static int __dm_resume(struct mapped_device *md, struct dm_table *map)

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))
@@ -2277,10 +2278,8 @@ retry:

clear_bit(DMF_SUSPENDED, &md->flags);

- r = 0;
out:
mutex_unlock(&md->suspend_lock);
-
return r;
}

--
2.7.4 (Apple Git-66)