From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 13 Oct 2020 19:12:44 +0000 (-0700)
Subject: Merge tag 'block-5.10-2020-10-12' of git://git.kernel.dk/linux-block
X-Git-Tag: howlett/maple_spf/20210104~853
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3ad11d7ac8872b1c8da54494721fad8907ee41f7;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'block-5.10-2020-10-12' of git://git.kernel.dk/linux-block

Pull block updates from Jens Axboe:

 - Series of merge handling cleanups (Baolin, Christoph)

 - Series of blk-throttle fixes and cleanups (Baolin)

 - Series cleaning up BDI, seperating the block device from the
   backing_dev_info (Christoph)

 - Removal of bdget() as a generic API (Christoph)

 - Removal of blkdev_get() as a generic API (Christoph)

 - Cleanup of is-partition checks (Christoph)

 - Series reworking disk revalidation (Christoph)

 - Series cleaning up bio flags (Christoph)

 - bio crypt fixes (Eric)

 - IO stats inflight tweak (Gabriel)

 - blk-mq tags fixes (Hannes)

 - Buffer invalidation fixes (Jan)

 - Allow soft limits for zone append (Johannes)

 - Shared tag set improvements (John, Kashyap)

 - Allow IOPRIO_CLASS_RT for CAP_SYS_NICE (Khazhismel)

 - DM no-wait support (Mike, Konstantin)

 - Request allocation improvements (Ming)

 - Allow md/dm/bcache to use IO stat helpers (Song)

 - Series improving blk-iocost (Tejun)

 - Various cleanups (Geert, Damien, Danny, Julia, Tetsuo, Tian, Wang,
   Xianting, Yang, Yufen, yangerkun)

* tag 'block-5.10-2020-10-12' of git://git.kernel.dk/linux-block: (191 commits)
  block: fix uapi blkzoned.h comments
  blk-mq: move cancel of hctx->run_work to the front of blk_exit_queue
  blk-mq: get rid of the dead flush handle code path
  block: get rid of unnecessary local variable
  block: fix comment and add lockdep assert
  blk-mq: use helper function to test hw stopped
  block: use helper function to test queue register
  block: remove redundant mq check
  block: invoke blk_mq_exit_sched no matter whether have .exit_sched
  percpu_ref: don't refer to ref->data if it isn't allocated
  block: ratelimit handle_bad_sector() message
  blk-throttle: Re-use the throtl_set_slice_end()
  blk-throttle: Open code __throtl_de/enqueue_tg()
  blk-throttle: Move service tree validation out of the throtl_rb_first()
  blk-throttle: Move the list operation after list validation
  blk-throttle: Fix IO hang for a corner case
  blk-throttle: Avoid tracking latency if low limit is invalid
  blk-throttle: Avoid getting the current time if tg->last_finish_time is 0
  blk-throttle: Remove a meaningless parameter for throtl_downgrade_state()
  block: Remove redundant 'return' statement
  ...
---

3ad11d7ac8872b1c8da54494721fad8907ee41f7
diff --cc kernel/power/user.c
index 047f598f89a5,6510a8f7687f..740723bb3885
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@@ -69,11 -69,12 +69,10 @@@ static int snapshot_open(struct inode *
  	memset(&data->handle, 0, sizeof(struct snapshot_handle));
  	if ((filp->f_flags & O_ACCMODE) == O_RDONLY) {
  		/* Hibernating.  The image device should be accessible. */
- 		data->swap = swsusp_resume_device ?
- 			swap_type_of(swsusp_resume_device, 0, NULL) : -1;
+ 		data->swap = swap_type_of(swsusp_resume_device, 0);
  		data->mode = O_RDONLY;
  		data->free_bitmaps = false;
 -		error = __pm_notifier_call_chain(PM_HIBERNATION_PREPARE, -1, &nr_calls);
 -		if (error)
 -			__pm_notifier_call_chain(PM_POST_HIBERNATION, --nr_calls, NULL);
 +		error = pm_notifier_call_chain_robust(PM_HIBERNATION_PREPARE, PM_POST_HIBERNATION);
  	} else {
  		/*
  		 * Resuming.  We may need to wait for the image device to