diff options
author | Felix Fietkau <nbd@nbd.name> | 2017-04-12 09:35:14 +0200 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2017-04-26 10:27:45 +0200 |
commit | 0b7ed65cec8084bb98ae0e2758b7aca6c447cd4b (patch) | |
tree | 0fbaf87f5d29a8440b51c7709e40d1746afeaa4f /target/linux/generic/patches-4.9 | |
parent | 980c41f8e04f5586731e84492001971eb8371590 (diff) | |
download | upstream-0b7ed65cec8084bb98ae0e2758b7aca6c447cd4b.tar.gz upstream-0b7ed65cec8084bb98ae0e2758b7aca6c447cd4b.tar.bz2 upstream-0b7ed65cec8084bb98ae0e2758b7aca6c447cd4b.zip |
kernel: remove out of tree direct-io disable hack
Direct-IO support has to be enabled for the release build anyway, so
this hack is not worth keeping
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/generic/patches-4.9')
-rw-r--r-- | target/linux/generic/patches-4.9/903-debloat_direct_io.patch | 82 |
1 files changed, 0 insertions, 82 deletions
diff --git a/target/linux/generic/patches-4.9/903-debloat_direct_io.patch b/target/linux/generic/patches-4.9/903-debloat_direct_io.patch deleted file mode 100644 index fb8709e5bd..0000000000 --- a/target/linux/generic/patches-4.9/903-debloat_direct_io.patch +++ /dev/null @@ -1,82 +0,0 @@ ---- a/fs/Kconfig -+++ b/fs/Kconfig -@@ -97,6 +97,11 @@ config MANDATORY_FILE_LOCKING - - source "fs/crypto/Kconfig" - -+config DIRECT_IO -+ bool "Enable O_DIRECT support" if EXPERT -+ depends on BLOCK -+ default y -+ - source "fs/notify/Kconfig" - - source "fs/quota/Kconfig" ---- a/fs/Makefile -+++ b/fs/Makefile -@@ -14,7 +14,8 @@ obj-y := open.o read_write.o file_table. - stack.o fs_struct.o statfs.o fs_pin.o nsfs.o - - ifeq ($(CONFIG_BLOCK),y) --obj-y += buffer.o block_dev.o direct-io.o mpage.o -+obj-y += buffer.o block_dev.o mpage.o -+obj-$(CONFIG_DIRECT_IO) += direct-io.o - else - obj-y += no-block.o - endif ---- a/include/linux/fs.h -+++ b/include/linux/fs.h -@@ -2852,6 +2852,7 @@ enum { - DIO_SKIP_DIO_COUNT = 0x08, - }; - -+#ifdef CONFIG_DIRECT_IO - void dio_end_io(struct bio *bio, int error); - - ssize_t __blockdev_direct_IO(struct kiocb *iocb, struct inode *inode, -@@ -2859,6 +2860,20 @@ ssize_t __blockdev_direct_IO(struct kioc - get_block_t get_block, - dio_iodone_t end_io, dio_submit_t submit_io, - int flags); -+#else -+static inline void dio_end_io(struct bio *bio, int error) -+{ -+} -+static inline -+ssize_t __blockdev_direct_IO(struct kiocb *iocb, struct inode *inode, -+ struct block_device *bdev, struct iov_iter *iter, -+ get_block_t get_block, -+ dio_iodone_t end_io, dio_submit_t submit_io, -+ int flags) -+{ -+ return -EOPNOTSUPP; -+} -+#endif - - static inline ssize_t blockdev_direct_IO(struct kiocb *iocb, - struct inode *inode, ---- a/fs/fcntl.c -+++ b/fs/fcntl.c -@@ -53,8 +53,10 @@ static int setfl(int fd, struct file * f - - /* Pipe packetized mode is controlled by O_DIRECT flag */ - if (!S_ISFIFO(filp->f_inode->i_mode) && (arg & O_DIRECT)) { -+#ifdef CONFIG_DIRECT_IO - if (!filp->f_mapping || !filp->f_mapping->a_ops || - !filp->f_mapping->a_ops->direct_IO) -+#endif - return -EINVAL; - } - ---- a/fs/open.c -+++ b/fs/open.c -@@ -690,7 +690,9 @@ int open_check_o_direct(struct file *f) - { - /* NB: we're sure to have correct a_ops only after f_op->open */ - if (f->f_flags & O_DIRECT) { -+#ifdef CONFIG_DIRECT_IO - if (!f->f_mapping->a_ops || !f->f_mapping->a_ops->direct_IO) -+#endif - return -EINVAL; - } - return 0; |