提交 93c534ae 编写于 作者: A Alasdair G Kergon 提交者: Linus Torvalds

[PATCH] device-mapper: Fix dm_swap_table error cases

Fix dm_swap_table() __bind error cases: a missing unlock, and EINVAL
preferable to EPERM.
Signed-off-by: NAlasdair G Kergon <agk@redhat.com>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 c3cd4f6b
...@@ -966,23 +966,20 @@ static void __flush_deferred_io(struct mapped_device *md, struct bio *c) ...@@ -966,23 +966,20 @@ static void __flush_deferred_io(struct mapped_device *md, struct bio *c)
*/ */
int dm_swap_table(struct mapped_device *md, struct dm_table *table) int dm_swap_table(struct mapped_device *md, struct dm_table *table)
{ {
int r; int r = -EINVAL;
down_write(&md->lock); down_write(&md->lock);
/* device must be suspended */ /* device must be suspended */
if (!test_bit(DMF_SUSPENDED, &md->flags)) { if (!test_bit(DMF_SUSPENDED, &md->flags))
up_write(&md->lock); goto out;
return -EPERM;
}
__unbind(md); __unbind(md);
r = __bind(md, table); r = __bind(md, table);
if (r)
return r;
out:
up_write(&md->lock); up_write(&md->lock);
return 0; return r;
} }
/* /*
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册