Skip to content

Commit

Permalink
PM / Hibernate: user.c, fix SNAPSHOT_SET_SWAP_AREA handling
Browse files Browse the repository at this point in the history
When CONFIG_DEBUG_BLOCK_EXT_DEVT is set we decode the device
improperly by old_decode_dev and it results in an error while
hibernating with s2disk.

All users already pass the new device number, so switch to
new_decode_dev().

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Reported-and-tested-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: "Rafael J. Wysocki" <rjw@sisk.pl>
  • Loading branch information
Jiri Slaby authored and Rafael J. Wysocki committed Apr 10, 2010
1 parent 0eddb51 commit d88d405
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion kernel/power/user.c
Original file line number Diff line number Diff line change
@@ -420,7 +420,7 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd,
* User space encodes device types as two-byte values,
* so we need to recode them
*/
swdev = old_decode_dev(swap_area.dev);
swdev = new_decode_dev(swap_area.dev);
if (swdev) {
offset = swap_area.offset;
data->swap = swap_type_of(swdev, offset, NULL);

0 comments on commit d88d405

Please sign in to comment.