Commit f5b4aee1 authored by Mike Snitzer's avatar Mike Snitzer

dm: remove unnecessary local variables in __bind

Also remove empty newline before 'out:' label at end of __bind.
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent fa247089
...@@ -1872,8 +1872,6 @@ static struct dm_table *__bind(struct mapped_device *md, struct dm_table *t, ...@@ -1872,8 +1872,6 @@ static struct dm_table *__bind(struct mapped_device *md, struct dm_table *t,
struct queue_limits *limits) struct queue_limits *limits)
{ {
struct dm_table *old_map; struct dm_table *old_map;
struct request_queue *q = md->queue;
bool request_based = dm_table_request_based(t);
sector_t size; sector_t size;
int ret; int ret;
...@@ -1894,7 +1892,7 @@ static struct dm_table *__bind(struct mapped_device *md, struct dm_table *t, ...@@ -1894,7 +1892,7 @@ static struct dm_table *__bind(struct mapped_device *md, struct dm_table *t,
dm_table_event_callback(t, event_callback, md); dm_table_event_callback(t, event_callback, md);
if (request_based) { if (dm_table_request_based(t)) {
/* /*
* Leverage the fact that request-based DM targets are * Leverage the fact that request-based DM targets are
* immutable singletons - used to optimize dm_mq_queue_rq. * immutable singletons - used to optimize dm_mq_queue_rq.
...@@ -1908,7 +1906,7 @@ static struct dm_table *__bind(struct mapped_device *md, struct dm_table *t, ...@@ -1908,7 +1906,7 @@ static struct dm_table *__bind(struct mapped_device *md, struct dm_table *t,
goto out; goto out;
} }
ret = dm_table_set_restrictions(t, q, limits); ret = dm_table_set_restrictions(t, md->queue, limits);
if (ret) { if (ret) {
old_map = ERR_PTR(ret); old_map = ERR_PTR(ret);
goto out; goto out;
...@@ -1920,7 +1918,6 @@ static struct dm_table *__bind(struct mapped_device *md, struct dm_table *t, ...@@ -1920,7 +1918,6 @@ static struct dm_table *__bind(struct mapped_device *md, struct dm_table *t,
if (old_map) if (old_map)
dm_sync_table(md); dm_sync_table(md);
out: out:
return old_map; return old_map;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment