aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.7
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
commitaad4224e0dc91e73ad54392c33cf198f5165f9cb (patch)
tree4c273c75dbde4a0978651143792a229aa89eb9a6 /target/linux/generic/patches-3.7
parentd28fdf7e932a5907804c98b064cc8707e07d04de (diff)
downloadupstream-aad4224e0dc91e73ad54392c33cf198f5165f9cb.tar.gz
upstream-aad4224e0dc91e73ad54392c33cf198f5165f9cb.tar.bz2
upstream-aad4224e0dc91e73ad54392c33cf198f5165f9cb.zip
kernel: fix a warning in the O_DIRECT debloat patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34740 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.7')
-rw-r--r--target/linux/generic/patches-3.7/903-debloat_direct_io.patch12
1 files changed, 1 insertions, 11 deletions
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