Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / fs / open.c

diff --git a/fs/open.c b/fs/open.c
index 1ae8e82..4dbdde5 100644 (file)
--- a/fs/open.c
+++ b/fs/open.c
@@ -959,12 +959,10 @@ struct file *filp_open(const char *filename, int flags, int mode)
 EXPORT_SYMBOL(filp_open);
 
 struct file *file_open_root(struct dentry *dentry, struct vfsmount *mnt,
-                           const char *filename, int flags)
+                           const char *filename, int flags, umode_t mode)
 {
        struct open_flags op;
-       int lookup = build_open_flags(flags, 0, &op);
-       if (flags & O_CREAT)
-               return ERR_PTR(-EINVAL);
+       int lookup = build_open_flags(flags, mode, &op);
        if (!filename && (flags & O_DIRECTORY))
                if (!dentry->d_inode->i_op->lookup)
                        return ERR_PTR(-ENOTDIR);