Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f431d966 authored by Kiyoshi Ueda's avatar Kiyoshi Ueda Committed by Alasdair G Kergon
Browse files

dm: remove unused flush_all 



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: default avatarKiyoshi Ueda <k-ueda@ct.jp.nec.com>
Signed-off-by: default avatarJun'ichi Nomura <j-nomura@ce.jp.nec.com>
Signed-off-by: default avatarMilan Broz <mbroz@redhat.com>
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
parent 1f965b19

drivers/md/dm.c

+1 −13
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ union map_info *dm_get_mapinfo(struct bio *bio) 
 */

struct dm_wq_req {

	enum {

		DM_WQ_FLUSH_ALL,

		DM_WQ_FLUSH_DEFERRED,

	} type;

	struct work_struct work;
@@ -1395,9 +1394,6 @@ static void dm_wq_work(struct work_struct *work) 


	down_write(&md->io_lock);

	switch (req->type) {

	case DM_WQ_FLUSH_ALL:

		__merge_pushback_list(md);

		/* pass through */

	case DM_WQ_FLUSH_DEFERRED:

		__flush_deferred_io(md);

		break;
@@ -1527,7 +1523,7 @@ int dm_suspend(struct mapped_device *md, unsigned suspend_flags) 
		if (!md->suspended_bdev) {

			DMWARN("bdget failed in dm_suspend");

			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);



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:

	if (r && md->suspended_bdev) {

		bdput(md->suspended_bdev);