init/Kconfig: clean up ANON_INODES and old IO schedulers options

[linux-block.git] / fs / block_dev.c

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 9501880dff5e2b1f1ee6cd7f85ee26a7362771a3..52b6f646cdbd0af27d827d9e4d983ec1455c87f0 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -34,6 +34,7 @@
 #include <linux/task_io_accounting_ops.h>
 #include <linux/falloc.h>
 #include <linux/uaccess.h>
+#include <linux/suspend.h>
 #include "internal.h"
 
 struct bdev_inode {
@@ -2013,7 +2014,8 @@ ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from)
        if (bdev_read_only(I_BDEV(bd_inode)))
                return -EPERM;
 
-       if (IS_SWAPFILE(bd_inode))
+       /* uswsusp needs write permission to the swap */
+       if (IS_SWAPFILE(bd_inode) && !hibernation_available())
                return -ETXTBSY;
 
        if (!iov_iter_count(from))