qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dm: remove unnecessary local variables in __bind 

Bugzilla: https://bugzilla.redhat.com/2090507
Upstream Status: kernel/git/torvalds/linux.git

commit f5b4aee10c024a35901cc2f1b9b4d80986a93937
Author: Mike Snitzer <snitzer@redhat.com>
Date:   Tue Feb 22 13:38:02 2022 -0500

    dm: remove unnecessary local variables in __bind

    Also remove empty newline before 'out:' label at end of __bind.

    Signed-off-by: Mike Snitzer <snitzer@redhat.com>

Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
This commit is contained in:
Benjamin Marzinski 2022-06-21 10:46:10 -05:00
parent 4b8f49137c
commit e9850a2a26
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/md/dm.c
View File

@ -1919,8 +1919,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;
@ -1941,7 +1939,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.
@ -1955,7 +1953,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;
@ -1967,7 +1965,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;
} }