netfilter: merge ctinfo into nfct pointer storage area

[mirror_ubuntu-artful-kernel.git] / fs / fcntl.c

diff --git a/fs/fcntl.c b/fs/fcntl.c
index 350a2c8cfd28f3f1339613b31564da1c2422e917..e1c54f20325ca870af01d26e21d42dc0c94604a9 100644 (file)
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -25,7 +25,7 @@
 
 #include <asm/poll.h>
 #include <asm/siginfo.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)
 
@@ -52,7 +52,7 @@ static int setfl(int fd, struct file * filp, unsigned long arg)
                   arg |= O_NONBLOCK;
 
        /* Pipe packetized mode is controlled by O_DIRECT flag */
-       if (!S_ISFIFO(filp->f_inode->i_mode) && (arg & O_DIRECT)) {
+       if (!S_ISFIFO(inode->i_mode) && (arg & O_DIRECT)) {
                if (!filp->f_mapping || !filp->f_mapping->a_ops ||
                        !filp->f_mapping->a_ops->direct_IO)
                                return -EINVAL;