diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2006-08-27 01:23:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-27 11:01:28 -0700 |
| commit | b6b5bce3571e496504a89ee575d32101e0a98b93 (patch) | |
| tree | 283d4da88216071813b25d82c6e49a5ab71948f9 /mm/swapfile.c | |
| parent | c06aad854fdb9da38fcc22dccfe9d72919453e43 (diff) | |
| download | op-kernel-dev-b6b5bce3571e496504a89ee575d32101e0a98b93.zip op-kernel-dev-b6b5bce3571e496504a89ee575d32101e0a98b93.tar.gz | |
[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>
Diffstat (limited to 'mm/swapfile.c')
| -rw-r--r-- | mm/swapfile.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c index e70d6c6..f1f5ec7 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -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); |
