diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-12-17 20:55:49 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-12-17 20:55:49 +0000 |
| commit | 3a6683f03de73c8b5f38206e4a3de281c979e3df (patch) | |
| tree | 4c273c75dbde4a0978651143792a229aa89eb9a6 /target/linux/generic/patches-3.6 | |
| parent | 9114e89b44e79fc8c5d5362231cdba614cdc6a03 (diff) | |
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.6')
| -rw-r--r-- | target/linux/generic/patches-3.6/903-debloat_direct_io.patch | 12 |
1 files changed, 1 insertions, 11 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 4af672843..4b57a5b05 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 |