mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-24 00:07:11 +02:00
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
This commit is contained in:
parent
9114e89b44
commit
3a6683f03d
@ -26,7 +26,7 @@
|
|||||||
endif
|
endif
|
||||||
--- a/include/linux/fs.h
|
--- a/include/linux/fs.h
|
||||||
+++ b/include/linux/fs.h
|
+++ b/include/linux/fs.h
|
||||||
@@ -2632,20 +2632,36 @@ enum {
|
@@ -2632,12 +2632,26 @@ enum {
|
||||||
DIO_SKIP_HOLES = 0x02,
|
DIO_SKIP_HOLES = 0x02,
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -53,16 +53,6 @@
|
|||||||
|
|
||||||
static inline ssize_t blockdev_direct_IO(int rw, struct kiocb *iocb,
|
static inline ssize_t blockdev_direct_IO(int rw, struct kiocb *iocb,
|
||||||
struct inode *inode, const struct iovec *iov, loff_t offset,
|
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
|
--- a/fs/fcntl.c
|
||||||
+++ b/fs/fcntl.c
|
+++ b/fs/fcntl.c
|
||||||
@@ -169,8 +169,10 @@ static int setfl(int fd, struct file * f
|
@@ -169,8 +169,10 @@ static int setfl(int fd, struct file * f
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
endif
|
endif
|
||||||
--- a/include/linux/fs.h
|
--- a/include/linux/fs.h
|
||||||
+++ b/include/linux/fs.h
|
+++ b/include/linux/fs.h
|
||||||
@@ -2444,20 +2444,36 @@ enum {
|
@@ -2444,12 +2444,26 @@ enum {
|
||||||
DIO_SKIP_HOLES = 0x02,
|
DIO_SKIP_HOLES = 0x02,
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -53,16 +53,6 @@
|
|||||||
|
|
||||||
static inline ssize_t blockdev_direct_IO(int rw, struct kiocb *iocb,
|
static inline ssize_t blockdev_direct_IO(int rw, struct kiocb *iocb,
|
||||||
struct inode *inode, const struct iovec *iov, loff_t offset,
|
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
|
--- a/fs/fcntl.c
|
||||||
+++ b/fs/fcntl.c
|
+++ b/fs/fcntl.c
|
||||||
@@ -51,8 +51,10 @@ static int setfl(int fd, struct file * f
|
@@ -51,8 +51,10 @@ static int setfl(int fd, struct file * f
|
||||||
|
Loading…
Reference in New Issue
Block a user