[PATCH] swsusp: Do not fail if resume device is not set

In the kernels later than 2.6.19 there is a regression that makes swsusp
fail if the resume device is not explicitly specified.

It can be fixed by adding an additional parameter to
mm/swapfile.c:swap_type_of() allowing us to pass the (struct block_device
*) corresponding to the first available swap back to the caller.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 7 insertions, 1 deletions

diff --git a/mm/swapfile.c b/mm/swapfile.c
index b9fc0e5de6d5..a2d9bb4e80df 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -434,7 +434,7 @@ void free_swap_and_cache(swp_entry_t entry)
  *
  * This is needed for the suspend to disk (aka swsusp).
  */
-int swap_type_of(dev_t device, sector_t offset)
+int swap_type_of(dev_t device, sector_t offset, struct block_device **bdev_p)
 {
         struct block_device *bdev = NULL;
         int i;
@@ -450,6 +450,9 @@ int swap_type_of(dev_t device, sector_t offset)
                         continue;
 
                 if (!bdev) {
+                        if (bdev_p)
+                                *bdev_p = sis->bdev;
+
                         spin_unlock(&swap_lock);
                         return i;
                 }
@@ -459,6 +462,9 @@ int swap_type_of(dev_t device, sector_t offset)
                         se = list_entry(sis->extent_list.next,
                                         struct swap_extent, list);
                         if (se->start_block == offset) {
+                                if (bdev_p)
+                                        *bdev_p = sis->bdev;
+
                                 spin_unlock(&swap_lock);
                                 bdput(bdev);
                                 return i;