2 bugs related to suspend to disk

[Marcin Slusarz <marcin.slusarz@gmail.com>]

1) echo platform > /sys/power/disk; echo disk > /sys/power/state

works but prints:

BUG: sleeping function called from invalid context at include/linux/writeback.h:87
in_atomic(): 1, irqs_disabled(): 0, pid: 6509, name: sh
3 locks held by sh/6509:
 #0:  (&buffer->mutex){+.+.+.}, at: [<>] sysfs_write_file+0x38/0x119
 #1:  (pm_mutex){+.+.+.}, at: [<>] hibernate+0x17/0x169
 #2:  (swap_lock){+.+...}, at: [<>] swap_type_of+0x2e/0xed
Pid: 6509, comm: sh Not tainted 2.6.30-rc7-mod #124
Call Trace:
 ? __debug_show_held_locks
 ? bdev_test
 __might_sleep
 ifind
 ? bdev_test
 iget5_locked
 ? bdev_set
 bdget
 swap_type_of
 swsusp_write
 ? acpi_sleep_tts_switch
 hibernate
 state_store
 kobj_attr_store
 sysfs_write_file
 vfs_write
 sys_write
 system_call_fastpath

2) "s2disk" (from suspend-0.8) suspends, but doesn't resume (and I need to mkswap && swapon -a later)

It's not a regression, because I never tried to STD (STR worked).

Marcin