Merge branches 'acpica', 'acpi-video' and 'acpi-fan'

[sfrench/cifs-2.6.git] / fs / open.c

diff --git a/fs/open.c b/fs/open.c
index b6f1e96a7c0b331b3e5a5d9bb4c014c5c9edc54b..b25b1542c5304a74999db5ad52af57e89133a68e 100644 (file)
--- a/fs/open.c
+++ b/fs/open.c
@@ -887,7 +887,7 @@ EXPORT_SYMBOL(dentry_open);
 static inline int build_open_flags(int flags, umode_t mode, struct open_flags *op)
 {
        int lookup_flags = 0;
-       int acc_mode;
+       int acc_mode = ACC_MODE(flags);
 
        if (flags & (O_CREAT | __O_TMPFILE))
                op->mode = (mode & S_IALLUGO) | S_IFREG;
@@ -909,7 +909,6 @@ static inline int build_open_flags(int flags, umode_t mode, struct open_flags *o
        if (flags & __O_TMPFILE) {
                if ((flags & O_TMPFILE_MASK) != O_TMPFILE)
                        return -EINVAL;
-               acc_mode = MAY_OPEN | ACC_MODE(flags);
                if (!(acc_mode & MAY_WRITE))
                        return -EINVAL;
        } else if (flags & O_PATH) {
@@ -919,8 +918,6 @@ static inline int build_open_flags(int flags, umode_t mode, struct open_flags *o
                 */
                flags &= O_DIRECTORY | O_NOFOLLOW | O_PATH;
                acc_mode = 0;
-       } else {
-               acc_mode = MAY_OPEN | ACC_MODE(flags);
        }
 
        op->open_flag = flags;