Commit a1bb7d61233ba5fb5cd865f907a9ddcc8f8c02bd

Authored by Alan Jenkins
Committed by Linus Torvalds
1 parent eed3ee0829

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

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>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

... ... @@ -635,7 +635,7 @@
635 635  
636 636 if (!bdev) {
637 637 if (bdev_p)
638   - *bdev_p = sis->bdev;
  638 + *bdev_p = bdget(sis->bdev->bd_dev);
639 639  
640 640 spin_unlock(&swap_lock);
641 641 return i;
... ... @@ -647,7 +647,7 @@
647 647 struct swap_extent, list);
648 648 if (se->start_block == offset) {
649 649 if (bdev_p)
650   - *bdev_p = sis->bdev;
  650 + *bdev_p = bdget(sis->bdev->bd_dev);
651 651  
652 652 spin_unlock(&swap_lock);
653 653 bdput(bdev);