From: Alasdair G Kergon Date: Thu, 9 Nov 2006 01:44:43 +0000 (-0800) Subject: [PATCH] dm: suspend: fix error path X-Git-Tag: v2.6.19-rc6~61 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d287483d6d7a2d5b313aee155285f89b57d9cd4a;p=linux-2.6-omap-h63xx.git [PATCH] dm: suspend: fix error path If the device is already suspended, just return the error and skip the code that would incorrectly wipe md->suspended_bdev. (This isn't currently a problem because existing code avoids calling this function if the device is already suspended.) Signed-off-by: Alasdair G Kergon Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/md/dm.c b/drivers/md/dm.c index b5764a86c8b..fc4f743f3b5 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -1285,7 +1285,7 @@ int dm_suspend(struct mapped_device *md, int do_lockfs) down(&md->suspend_lock); if (dm_suspended(md)) - goto out; + goto out_unlock; map = dm_get_table(md); @@ -1361,6 +1361,8 @@ out: } dm_table_put(map); + +out_unlock: up(&md->suspend_lock); return r; }