Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86

[cascardo/linux.git] / fs / internal.h

diff --git a/fs/internal.h b/fs/internal.h
index 6812158..7c5f01c 100644 (file)
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -96,11 +96,12 @@ struct open_flags {
        umode_t mode;
        int acc_mode;
        int intent;
+       int lookup_flags;
 };
 extern struct file *do_filp_open(int dfd, struct filename *pathname,
-               const struct open_flags *op, int flags);
+               const struct open_flags *op);
 extern struct file *do_file_open_root(struct dentry *, struct vfsmount *,
-               const char *, const struct open_flags *, int lookup_flags);
+               const char *, const struct open_flags *);
 
 extern long do_handle_open(int mountdirfd,
                           struct file_handle __user *ufh, int open_flag);
@@ -130,6 +131,7 @@ extern struct dentry *__d_alloc(struct super_block *, const struct qstr *);
  * read_write.c
  */
 extern ssize_t __kernel_write(struct file *, const char *, size_t, loff_t *);
+extern int rw_verify_area(int, struct file *, const loff_t *, size_t);
 
 /*
  * splice.c