From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Feb 2015 00:36:31 +0000 (-0800)
Subject: Merge tag 'dm-3.20-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device... 
X-Git-Tag: v5.15~16341
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=802ea9d8645d33d24b7b4cd4537c14f3e698bde0;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'dm-3.20-changes' of git://git./linux/kernel/git/device-mapper/linux-dm

Pull device mapper changes from Mike Snitzer:

 - The most significant change this cycle is request-based DM now
   supports stacking ontop of blk-mq devices.  This blk-mq support
   changes the model request-based DM uses for cloning a request to
   relying on calling blk_get_request() directly from the underlying
   blk-mq device.

   An early consumer of this code is Intel's emerging NVMe hardware;
   thanks to Keith Busch for working on, and pushing for, these changes.

 - A few other small fixes and cleanups across other DM targets.

* tag 'dm-3.20-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
  dm: inherit QUEUE_FLAG_SG_GAPS flags from underlying queues
  dm snapshot: remove unnecessary NULL checks before vfree() calls
  dm mpath: simplify failure path of dm_multipath_init()
  dm thin metadata: remove unused dm_pool_get_data_block_size()
  dm ioctl: fix stale comment above dm_get_inactive_table()
  dm crypt: update url in CONFIG_DM_CRYPT help text
  dm bufio: fix time comparison to use time_after_eq()
  dm: use time_in_range() and time_after()
  dm raid: fix a couple integer overflows
  dm table: train hybrid target type detection to select blk-mq if appropriate
  dm: allocate requests in target when stacking on blk-mq devices
  dm: prepare for allocating blk-mq clone requests in target
  dm: submit stacked requests in irq enabled context
  dm: split request structure out from dm_rq_target_io structure
  dm: remove exports for request-based interfaces without external callers
---

802ea9d8645d33d24b7b4cd4537c14f3e698bde0
diff --cc drivers/md/dm.c
index 68c1b53,549b815..ec1444f
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@@ -206,10 -209,10 +209,13 @@@ struct mapped_device 
  	/* zero-length flush that will be cloned and submitted to targets */
  	struct bio flush_bio;
  
 +	/* the number of internal suspends */
 +	unsigned internal_suspend_count;
 +
  	struct dm_stats stats;
+ 
+ 	struct kthread_worker kworker;
+ 	struct task_struct *kworker_task;
  };
  
  /*