Commit 4eb2bd24 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-6.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management fixes from Rafael Wysocki:
 "Fix the handling of block devices in the test_resume mode of
  hibernation (Chen Yu)"

* tag 'pm-6.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM: hibernate: Fix the exclusive get block device in test_resume mode
  PM: hibernate: Rename function parameter from snapshot_test to exclusive
parents e2dd7a16 148b6f4c

kernel/power/hibernate.c

+6 −6
Original line number Diff line number Diff line
@@ -786,9 +786,9 @@ int hibernate(void) 
	unlock_device_hotplug();

	if (snapshot_test) {

		pm_pr_dbg("Checking hibernation image\n");

		error = swsusp_check(snapshot_test);

		error = swsusp_check(false);

		if (!error)

			error = load_image_and_restore(snapshot_test);

			error = load_image_and_restore(false);

	}

	thaw_processes();
@@ -945,14 +945,14 @@ static int software_resume(void) 
	pm_pr_dbg("Looking for hibernation image.\n");



	mutex_lock(&system_transition_mutex);

	error = swsusp_check(false);

	error = swsusp_check(true);

	if (error)

		goto Unlock;



	/* The snapshot device should not be opened while we're running */

	if (!hibernate_acquire()) {

		error = -EBUSY;

		swsusp_close(false);

		swsusp_close(true);

		goto Unlock;

	}
@@ -973,7 +973,7 @@ static int software_resume(void) 
		goto Close_Finish;

	}



	error = load_image_and_restore(false);

	error = load_image_and_restore(true);

	thaw_processes();

 Finish:

	pm_notifier_call_chain(PM_POST_RESTORE);
@@ -987,7 +987,7 @@ static int software_resume(void) 
	pm_pr_dbg("Hibernation image not present or could not be loaded.\n");

	return error;

 Close_Finish:

	swsusp_close(false);

	swsusp_close(true);

	goto Finish;

}

kernel/power/power.h

+2 −2
Original line number Diff line number Diff line
@@ -168,11 +168,11 @@ extern int swsusp_swap_in_use(void); 
#define SF_HW_SIG		8



/* kernel/power/hibernate.c */

int swsusp_check(bool snapshot_test);

int swsusp_check(bool exclusive);

extern void swsusp_free(void);

extern int swsusp_read(unsigned int *flags_p);

extern int swsusp_write(unsigned int flags);

void swsusp_close(bool snapshot_test);

void swsusp_close(bool exclusive);

#ifdef CONFIG_SUSPEND

extern int swsusp_unmark(void);

#endif

kernel/power/swap.c

+8 −6
Original line number Diff line number Diff line
@@ -1514,11 +1514,12 @@ static void *swsusp_holder; 


/**

 * swsusp_check - Check for swsusp signature in the resume device

 * @exclusive: Open the resume device exclusively.

 */



int swsusp_check(bool snapshot_test)

int swsusp_check(bool exclusive)

{

	void *holder = snapshot_test ? &swsusp_holder : NULL;

	void *holder = exclusive ? &swsusp_holder : NULL;

	int error;



	hib_resume_bdev = blkdev_get_by_dev(swsusp_resume_device, BLK_OPEN_READ,
@@ -1564,16 +1565,17 @@ int swsusp_check(bool snapshot_test) 


/**

 * swsusp_close - close swap device.

 * @exclusive: Close the resume device which is exclusively opened.

 */



void swsusp_close(bool snapshot_test)

void swsusp_close(bool exclusive)

{

	if (IS_ERR(hib_resume_bdev)) {

		pr_debug("Image device not initialised\n");

		return;

	}



	blkdev_put(hib_resume_bdev, snapshot_test ? &swsusp_holder : NULL);

	blkdev_put(hib_resume_bdev, exclusive ? &swsusp_holder : NULL);

}



/**