Merge branches 'work.misc' and 'work.dcache' of git://git.kernel.org/pub/scm/linux...

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

diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index ddae52bd199318ef6d268c337e4cb0fcdd0fe4b3..3713d22b95a7011bda1e8701e5aea54fee96ea2a 100644 (file)
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -465,8 +465,7 @@ out_err:
 
 int
 cifs_atomic_open(struct inode *inode, struct dentry *direntry,
-                struct file *file, unsigned oflags, umode_t mode,
-                int *opened)
+                struct file *file, unsigned oflags, umode_t mode)
 {
        int rc;
        unsigned int xid;
@@ -539,9 +538,9 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry,
        }
 
        if ((oflags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL))
-               *opened |= FILE_CREATED;
+               file->f_mode |= FMODE_CREATED;
 
-       rc = finish_open(file, direntry, generic_file_open, opened);
+       rc = finish_open(file, direntry, generic_file_open);
        if (rc) {
                if (server->ops->close)
                        server->ops->close(xid, tcon, &fid);