KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kernel: fix a warning in the O_DIRECT debloat patch

Browse source 
SVN-Revision: 34740
This commit is contained in:
Felix Fietkau 2012-12-17 20:55:49 +00:00
parent ba2286296e
commit 1bdea42662
2 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
target/linux/generic/patches-3.6/903-debloat_direct_io.patch
View file

@ -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

12
target/linux/generic/patches-3.7/903-debloat_direct_io.patch
View file

@ -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