From: Felix Fietkau Date: Mon, 17 Dec 2012 20:55:49 +0000 (+0000) Subject: kernel: fix a warning in the O_DIRECT debloat patch X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1bdea42662181776ec266d9595fbcb92ff4641ed;p=openwrt%2Fstaging%2Flinusw.git kernel: fix a warning in the O_DIRECT debloat patch SVN-Revision: 34740 --- diff --git a/target/linux/generic/patches-3.6/903-debloat_direct_io.patch b/target/linux/generic/patches-3.6/903-debloat_direct_io.patch index 4af6728439..4b57a5b054 100644 --- a/target/linux/generic/patches-3.6/903-debloat_direct_io.patch +++ b/target/linux/generic/patches-3.6/903-debloat_direct_io.patch @@ -26,7 +26,7 @@ endif --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -2632,20 +2632,36 @@ enum { +@@ -2632,12 +2632,26 @@ enum { DIO_SKIP_HOLES = 0x02, }; @@ -53,16 +53,6 @@ static inline ssize_t blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode, const struct iovec *iov, loff_t offset, - unsigned long nr_segs, get_block_t get_block) - { -+#ifdef CONFIG_DIRECT_IO - return __blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev, iov, - offset, nr_segs, get_block, NULL, NULL, - DIO_LOCKING | DIO_SKIP_HOLES); -+#endif - } - #endif - --- a/fs/fcntl.c +++ b/fs/fcntl.c @@ -169,8 +169,10 @@ static int setfl(int fd, struct file * f diff --git a/target/linux/generic/patches-3.7/903-debloat_direct_io.patch b/target/linux/generic/patches-3.7/903-debloat_direct_io.patch index 20b2423af1..5cc5e78017 100644 --- a/target/linux/generic/patches-3.7/903-debloat_direct_io.patch +++ b/target/linux/generic/patches-3.7/903-debloat_direct_io.patch @@ -26,7 +26,7 @@ endif --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -2444,20 +2444,36 @@ enum { +@@ -2444,12 +2444,26 @@ enum { DIO_SKIP_HOLES = 0x02, }; @@ -53,16 +53,6 @@ static inline ssize_t blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode, const struct iovec *iov, loff_t offset, - unsigned long nr_segs, get_block_t get_block) - { -+#ifdef CONFIG_DIRECT_IO - return __blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev, iov, - offset, nr_segs, get_block, NULL, NULL, - DIO_LOCKING | DIO_SKIP_HOLES); -+#endif - } - #endif - --- a/fs/fcntl.c +++ b/fs/fcntl.c @@ -51,8 +51,10 @@ static int setfl(int fd, struct file * f