Commit b6b5bce3 authored Aug 27, 2006 by Rafael J. Wysocki Committed by Linus Torvalds Aug 27, 2006

[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>

parent c06aad85

mm/swapfile.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -442,11 +442,12 @@ int swap_type_of(dev_t device)

		if (!(swap_info[i].flags & SWP_WRITEOK))
		continue;

		if (!device) {
		spin_unlock(&swap_lock);
		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))) {
		spin_unlock(&swap_lock);