[patch 18/20] swsusp: Fix swap_type_of

From: Greg KH
Date: Mon Aug 21 2006 - 14:48:20 EST

-stable review patch. If anyone has any objections, please let us know.

From: "Rafael J. Wysocki" <rjw@xxxxxxx>

There is a bug in mm/swapfile.c#swap_type_of() that makes swsusp only be
able to use the first active swap partition as the resume device. Fix it.

Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Cc: Hugh Dickins <hugh@xxxxxxxxxxx>
Acked-by: Pavel Machek <pavel@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>

mm/swapfile.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

--- linux-
+++ linux-
@@ -440,11 +440,12 @@ int swap_type_of(dev_t device)

if (!(swap_info[i].flags & SWP_WRITEOK))
if (!device) {
return i;
- inode = swap_info->swap_file->f_dentry->d_inode;
+ inode = swap_info[i].swap_file->f_dentry->d_inode;
if (S_ISBLK(inode->i_mode) &&
device == MKDEV(imajor(inode), iminor(inode))) {

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/