summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-12-17 20:55:49 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-12-17 20:55:49 +0000
commit1bdea42662181776ec266d9595fbcb92ff4641ed (patch)
treeeba8b8961dd7a30372a165ae36827d8c6e2bd6f4
parentba2286296e51baa90eb95f75f0a4e4b76bec3b0f (diff)
downloadmtk-20170518-1bdea42662181776ec266d9595fbcb92ff4641ed.zip
mtk-20170518-1bdea42662181776ec266d9595fbcb92ff4641ed.tar.gz
mtk-20170518-1bdea42662181776ec266d9595fbcb92ff4641ed.tar.bz2
kernel: fix a warning in the O_DIRECT debloat patch
SVN-Revision: 34740
-rw-r--r--target/linux/generic/patches-3.6/903-debloat_direct_io.patch12
-rw-r--r--target/linux/generic/patches-3.7/903-debloat_direct_io.patch12
2 files changed, 2 insertions, 22 deletions
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 4af6728..4b57a5b 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 20b2423..5cc5e78 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