->atomic_open() prototype change - pass int * instead of bool *

... and let finish_open() report having opened the file via that sucker.
Next step: don't modify od->filp at all.

[AV: FILE_CREATE was already used by cifs; Miklos' fix folded]

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

2 files changed, 7 insertions, 7 deletions

diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h
index 3a572bf5947f..92a7c3d8a031 100644
--- a/fs/cifs/cifsfs.h
+++ b/fs/cifs/cifsfs.h
@@ -48,7 +48,7 @@ extern int cifs_create(struct inode *, struct dentry *, umode_t,
                        struct nameidata *);
 extern struct file *cifs_atomic_open(struct inode *, struct dentry *,
                                      struct opendata *, unsigned, umode_t,
-                                     bool *);
+                                     int *);
 extern struct dentry *cifs_lookup(struct inode *, struct dentry *,
                                   struct nameidata *);
 extern int cifs_unlink(struct inode *dir, struct dentry *dentry);
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index 7a3dcd15d681..6cdf23fd70ee 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -160,7 +160,7 @@ check_name(struct dentry *direntry)
 static int cifs_do_create(struct inode *inode, struct dentry *direntry,
                           int xid, struct tcon_link *tlink, unsigned oflags,
                           umode_t mode, __u32 *oplock, __u16 *fileHandle,
-                          bool *created)
+                          int *created)
 {
         int rc = -ENOENT;
         int create_options = CREATE_NOT_DIR;
@@ -311,7 +311,7 @@ static int cifs_do_create(struct inode *inode, struct dentry *direntry,
                                 .device = 0,
                 };
 
-                *created = true;
+                *created |= FILE_CREATED;
                 if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) {
                         args.uid = (__u64) current_fsuid();
                         if (inode->i_mode & S_ISGID)
@@ -379,7 +379,7 @@ out:
 struct file *
 cifs_atomic_open(struct inode *inode, struct dentry *direntry,
                  struct opendata *od, unsigned oflags, umode_t mode,
-                 bool *created)
+                 int *opened)
 {
         int rc;
         int xid;
@@ -426,14 +426,14 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry,
         tcon = tlink_tcon(tlink);
 
         rc = cifs_do_create(inode, direntry, xid, tlink, oflags, mode,
-                            &oplock, &fileHandle, created);
+                            &oplock, &fileHandle, opened);
 
         if (rc) {
                 filp = ERR_PTR(rc);
                 goto out;
         }
 
-        filp = finish_open(od, direntry, generic_file_open);
+        filp = finish_open(od, direntry, generic_file_open, opened);
         if (IS_ERR(filp)) {
                 CIFSSMBClose(xid, tcon, fileHandle);
                 goto out;
@@ -469,7 +469,7 @@ int cifs_create(struct inode *inode, struct dentry *direntry, umode_t mode,
         struct tcon_link *tlink;
         __u16 fileHandle;
         __u32 oplock;
-        bool created = true;
+        int created = FILE_CREATED;
 
         cFYI(1, "cifs_create parent inode = 0x%p name is: %s and dentry = 0x%p",
              inode, direntry->d_name.name, direntry);