GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-28 09:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

PM/hibernate: fix "swap breaks after hibernation failures"

Browse source 
http://bugzilla.kernel.org/show_bug.cgi?id=12239

The image writing code dropped a reference to the current swap device.
This doesn't show up if the hibernation succeeds - because it doesn't
affect the image which gets resumed.  But it means multiple _failed_
hibernations end up freeing the swap device while it is still use!

swsusp_write() finds the block device for the swap file using swap_type_of().
It then uses blkdev_get() / blkdev_put() to open and close the block device.

Unfortunately, blkdev_get() assumes ownership of the inode of the block_device
passed to it.  So blkdev_put() calls iput() on the inode.  This is by design
and other callers expect this behaviour.  The fix is for swap_type_of() to take
a reference on the inode using bdget().

Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Len Brown <lenb@kernel.org>
Cc: Greg KH <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alan Jenkins 2009-02-14 02:01:14 +01:00 • committed by Linus Torvalds
parent eed3ee0829
commit a1bb7d6123
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mm/swapfile.c
View file

@ -635,7 +635,7 @@ int swap_type_of(dev_t device, sector_t offset, struct block_device **bdev_p)
if (!bdev) { if (!bdev) {
if (bdev_p) if (bdev_p)
*bdev_p = sis->bdev; *bdev_p = bdget(sis->bdev->bd_dev);
spin_unlock(&swap_lock); spin_unlock(&swap_lock);
return i; return i;
@ -647,7 +647,7 @@ int swap_type_of(dev_t device, sector_t offset, struct block_device **bdev_p)
struct swap_extent, list); struct swap_extent, list);
if (se->start_block == offset) { if (se->start_block == offset) {
if (bdev_p) if (bdev_p)
*bdev_p = sis->bdev; *bdev_p = bdget(sis->bdev->bd_dev);
spin_unlock(&swap_lock); spin_unlock(&swap_lock);
bdput(bdev); bdput(bdev);