Commit b6b5bce3 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Linus Torvalds

[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: default avatarRafael J. Wysocki <>
Cc: Hugh Dickins <>
Acked-by: default avatarPavel Machek <>
Cc: <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent c06aad85
...@@ -442,11 +442,12 @@ int swap_type_of(dev_t device) ...@@ -442,11 +442,12 @@ int swap_type_of(dev_t device)
if (!(swap_info[i].flags & SWP_WRITEOK)) if (!(swap_info[i].flags & SWP_WRITEOK))
continue; continue;
if (!device) { if (!device) {
spin_unlock(&swap_lock); spin_unlock(&swap_lock);
return i; 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) && if (S_ISBLK(inode->i_mode) &&
device == MKDEV(imajor(inode), iminor(inode))) { device == MKDEV(imajor(inode), iminor(inode))) {
spin_unlock(&swap_lock); spin_unlock(&swap_lock);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment