Merge branch 'for-linus' of git://git.kernel.dk/linux-block

Pull more block layer updates from Jens Axboe:
 "A followup pull request, with some parts that either needed a bit more
  testing before going in, merge sync, or just later arriving fixes.
  This contains:

   - Timer related updates from Kees. These were purposefully delayed
     since I didn't want to pull in a later v4.14-rc tag to my block
     tree.

   - ide-cd prep sense buffer fix from Bart. Also delayed, as not to
     clash with the late fix we put into 4.14-rc.

   - Small BFQ updates series from Luca and Paolo.

   - Single nvmet fix from James, fixing a non-functional case there.

   - Bio fast clone fix from Michael, which made bcache return the wrong
     data for some cases.

   - Legacy IO path regression hang fix from Ming"

* 'for-linus' of git://git.kernel.dk/linux-block:
  bio: ensure __bio_clone_fast copies bi_partno
  nvmet_fc: fix better length checking
  block: wake up all tasks blocked in get_request()
  block, bfq: move debug blkio stats behind CONFIG_DEBUG_BLK_CGROUP
  block, bfq: update blkio stats outside the scheduler lock
  block, bfq: add missing invocations of bfqg_stats_update_io_add/remove
  doc, block, bfq: update max IOPS sustainable with BFQ
  ide: Make ide_cdrom_prep_fs() initialize the sense buffer pointer
  md: Convert timers to use timer_setup()
  block: swim3: Convert timers to use timer_setup()
  block/aoe: Convert timers to use timer_setup()
  amifloppy: Convert timers to use timer_setup()
  block/floppy: Convert callback to pass timer_list

diff --combined drivers/md/md.c
index c3dc134b9fb5771b805db0d6a9ba02637be0e47f,0f2d79d16949699bcd1eba1f2c4881908ec9f574..41c050b59ec454f139b359fdcdc116d964103d61
--- 1/drivers/md/md.c
--- 2/drivers/md/md.c
+++ b/drivers/md/md.c
@@@ -541,7 -541,7 +541,7 @@@ static void mddev_put(struct mddev *mdd
                bioset_free(sync_bs);
  }
  
- static void md_safemode_timeout(unsigned long data);
+ static void md_safemode_timeout(struct timer_list *t);
  
  void mddev_init(struct mddev *mddev)
  {
@@@ -550,8 -550,7 +550,7 @@@
        mutex_init(&mddev->bitmap_info.mutex);
        INIT_LIST_HEAD(&mddev->disks);
        INIT_LIST_HEAD(&mddev->all_mddevs);
-       setup_timer(&mddev->safemode_timer, md_safemode_timeout,
-                   (unsigned long) mddev);
+       timer_setup(&mddev->safemode_timer, md_safemode_timeout, 0);
        atomic_set(&mddev->active, 1);
        atomic_set(&mddev->openers, 0);
        atomic_set(&mddev->active_io, 0);
@@@ -5375,7 -5374,7 +5374,7 @@@ static struct kobject *md_probe(dev_t d
        return NULL;
  }
  
 -static int add_named_array(const char *val, struct kernel_param *kp)
 +static int add_named_array(const char *val, const struct kernel_param *kp)
  {
        /*
         * val must be "md_*" or "mdNNN".
@@@ -5404,9 -5403,9 +5403,9 @@@
        return -EINVAL;
  }
  
- static void md_safemode_timeout(unsigned long data)
+ static void md_safemode_timeout(struct timer_list *t)
  {
-       struct mddev *mddev = (struct mddev *) data;
+       struct mddev *mddev = from_timer(mddev, t, safemode_timer);
  
        mddev->safemode = 1;
        if (mddev->external)
@@@ -9315,11 -9314,11 +9314,11 @@@ static __exit void md_exit(void
  subsys_initcall(md_init);
  module_exit(md_exit)
  
 -static int get_ro(char *buffer, struct kernel_param *kp)
 +static int get_ro(char *buffer, const struct kernel_param *kp)
  {
        return sprintf(buffer, "%d", start_readonly);
  }
 -static int set_ro(const char *val, struct kernel_param *kp)
 +static int set_ro(const char *val, const struct kernel_param *kp)
  {
        return kstrtouint(val, 10, (unsigned int *)&start_readonly);
  }