[PATCH] swsusp: Fix swap_type_of

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@sisk.pl>
Cc: Hugh Dickins <hugh@veritas.com>
Acked-by: Pavel Machek <pavel@suse.cz>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Rafael J. Wysocki and committed by Linus Torvalds b6b5bce3 c06aad85

+2 -1
+2 -1
mm/swapfile.c
··· 442 443 if (!(swap_info[i].flags & SWP_WRITEOK)) 444 continue; 445 if (!device) { 446 spin_unlock(&swap_lock); 447 return i; 448 } 449 - inode = swap_info->swap_file->f_dentry->d_inode; 450 if (S_ISBLK(inode->i_mode) && 451 device == MKDEV(imajor(inode), iminor(inode))) { 452 spin_unlock(&swap_lock);
··· 442 443 if (!(swap_info[i].flags & SWP_WRITEOK)) 444 continue; 445 + 446 if (!device) { 447 spin_unlock(&swap_lock); 448 return i; 449 } 450 + inode = swap_info[i].swap_file->f_dentry->d_inode; 451 if (S_ISBLK(inode->i_mode) && 452 device == MKDEV(imajor(inode), iminor(inode))) { 453 spin_unlock(&swap_lock);