lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dm: remove unused flush_all

Browse Source 
This patch removes the DM_WQ_FLUSH_ALL state that is unnecessary.

The dm_queue_flush(md, DM_WQ_FLUSH_ALL, NULL) in dm_suspend()
is never invoked because:
  - 'goto flush_and_out' is the same as 'goto out' because
    the 'goto flush_and_out' is called only when '!noflush'
  - If r is non-zero, then the code above will invoke 'goto out'
    and skip this code.

No functional change.

Signed-off-by: Kiyoshi Ueda <k-ueda@ct.jp.nec.com>
Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
Signed-off-by: Milan Broz <mbroz@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
This commit is contained in:
Kiyoshi Ueda
2008-10-21 17:45:07 +01:00
committed by Alasdair G Kergon
parent 1f965b1943
commit f431d9666f
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/md/dm.c
View File

@@ -76,7 +76,6 @@ union map_info *dm_get_mapinfo(struct bio *bio)
*/ */
struct dm_wq_req { struct dm_wq_req {
enum { enum {
DM_WQ_FLUSH_ALL,
DM_WQ_FLUSH_DEFERRED, DM_WQ_FLUSH_DEFERRED,
} type; } type;
struct work_struct work; struct work_struct work;
@@ -1395,9 +1394,6 @@ static void dm_wq_work(struct work_struct *work)
down_write(&md->io_lock); down_write(&md->io_lock);
switch (req->type) { switch (req->type) {
case DM_WQ_FLUSH_ALL:
__merge_pushback_list(md);
/* pass through */
case DM_WQ_FLUSH_DEFERRED: case DM_WQ_FLUSH_DEFERRED:
__flush_deferred_io(md); __flush_deferred_io(md);
break; break;
@@ -1527,7 +1523,7 @@ int dm_suspend(struct mapped_device *md, unsigned suspend_flags)
if (!md->suspended_bdev) { if (!md->suspended_bdev) {
DMWARN("bdget failed in dm_suspend"); DMWARN("bdget failed in dm_suspend");
r = -ENOMEM; r = -ENOMEM;
goto flush_and_out; goto out;
} }
/* /*
@@ -1578,14 +1574,6 @@ int dm_suspend(struct mapped_device *md, unsigned suspend_flags)
set_bit(DMF_SUSPENDED, &md->flags); set_bit(DMF_SUSPENDED, &md->flags);
flush_and_out:
if (r && noflush)
/*
* Because there may be already I/Os in the pushback list,
* flush them before return.
*/
dm_queue_flush(md, DM_WQ_FLUSH_ALL, NULL);
out: out:
if (r && md->suspended_bdev) { if (r && md->suspended_bdev) {
bdput(md->suspended_bdev); bdput(md->suspended_bdev);