<div dir="ltr">Thanks for the updated patch, acked.<div><br></div><div>-- lvmguy</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Sep 6, 2021 at 6:17 AM Dinghao Liu <<a href="mailto:dinghao.liu@zju.edu.cn">dinghao.liu@zju.edu.cn</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">mddev_unlock() is called on all paths after we call mddev_lock_nointr(),<br>
except for three error handling paths, which may cause a deadlock.<br>
<br>
Fixes: 9dbd1aa3a81c ("dm raid: add reshaping support to the target")<br>
Signed-off-by: Dinghao Liu <<a href="mailto:dinghao.liu@zju.edu.cn" target="_blank">dinghao.liu@zju.edu.cn</a>><br>
Signed-off-by: Heinz Mauelshagen <<a href="mailto:heinzm@redhat.com" target="_blank">heinzm@redhat.com</a>><br>
---<br>
<br>
Changelog:<br>
<br>
v2: - Simplify the error handling paths.<br>
---<br>
drivers/md/dm-raid.c | 7 +++----<br>
1 file changed, 3 insertions(+), 4 deletions(-)<br>
<br>
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c<br>
index d9ef52159a22..741bab00e922 100644<br>
--- a/drivers/md/dm-raid.c<br>
+++ b/drivers/md/dm-raid.c<br>
@@ -3249,14 +3249,12 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv)<br>
rs->md.in_sync = 0; /* Assume already marked dirty */<br>
if (r) {<br>
ti->error = "Failed to run raid array";<br>
- mddev_unlock(&rs->md);<br>
- goto bad;<br>
+ goto bad_unlock;<br>
}<br>
<br>
r = md_start(&rs->md);<br>
if (r) {<br>
ti->error = "Failed to start raid array";<br>
- mddev_unlock(&rs->md);<br>
goto bad_md_start;<br>
}<br>
<br>
@@ -3265,7 +3263,6 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv)<br>
r = r5c_journal_mode_set(&rs->md, rs->journal_dev.mode);<br>
if (r) {<br>
ti->error = "Failed to set raid4/5/6 journal mode";<br>
- mddev_unlock(&rs->md);<br>
goto bad_journal_mode_set;<br>
}<br>
}<br>
@@ -3304,10 +3301,12 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv)<br>
mddev_unlock(&rs->md);<br>
return 0;<br>
<br>
+bad_unlock:<br>
bad_md_start:<br>
bad_journal_mode_set:<br>
bad_stripe_cache:<br>
bad_check_reshape:<br>
+ mddev_unlock(&rs->md);<br>
md_stop(&rs->md);<br>
bad:<br>
raid_set_free(rs);<br>
-- <br>
2.17.1<br>
<br>
</blockquote></div>