->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>

3 files changed, 8 insertions, 7 deletions

diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
index 75df600ec9b4..81e5e908df9d 100644
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
@@ -636,7 +636,7 @@ static struct dentry *ceph_lookup(struct inode *dir, struct dentry *dentry,
 
 struct file *ceph_atomic_open(struct inode *dir, struct dentry *dentry,
                               struct opendata *od, unsigned flags, umode_t mode,
-                              bool *created)
+                              int *opened)
 {
         int err;
         struct dentry *res = NULL;
@@ -650,7 +650,7 @@ struct file *ceph_atomic_open(struct inode *dir, struct dentry *dentry,
                 if (err < 0)
                         return ERR_PTR(err);
 
-                return ceph_lookup_open(dir, dentry, od, flags, mode);
+                return ceph_lookup_open(dir, dentry, od, flags, mode, opened);
         }
 
         if (d_unhashed(dentry)) {
@@ -668,8 +668,8 @@ struct file *ceph_atomic_open(struct inode *dir, struct dentry *dentry,
                 return NULL;
         }
 
-        *created = true;
-        filp = ceph_lookup_open(dir, dentry, od, flags, mode);
+        *opened |= FILE_CREATED;
+        filp = ceph_lookup_open(dir, dentry, od, flags, mode, opened);
         dput(res);
 
         return filp;
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index e34dc22e75a9..4c304a90d046 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -214,7 +214,8 @@ out:
  * ceph_release gets called).  So fear not!
  */
 struct file *ceph_lookup_open(struct inode *dir, struct dentry *dentry,
-                              struct opendata *od, unsigned flags, umode_t mode)
+                              struct opendata *od, unsigned flags, umode_t mode,
+                              int *opened)
 {
         struct ceph_fs_client *fsc = ceph_sb_to_client(dir->i_sb);
         struct ceph_mds_client *mdsc = fsc->mdsc;
@@ -247,7 +248,7 @@ struct file *ceph_lookup_open(struct inode *dir, struct dentry *dentry,
                 err = ceph_handle_notrace_create(dir, dentry);
         if (err)
                 goto out;
-        file = finish_open(od, req->r_dentry, ceph_open);
+        file = finish_open(od, req->r_dentry, ceph_open, opened);
         if (IS_ERR(file))
                 err = PTR_ERR(file);
 out:
diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index e61e54673e56..f9a325108b49 100644
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -808,7 +808,7 @@ extern struct page **ceph_alloc_page_vector(int num_pages, gfp_t flags);
 extern int ceph_open(struct inode *inode, struct file *file);
 extern struct file *ceph_lookup_open(struct inode *dir, struct dentry *dentry,
                                      struct opendata *od, unsigned flags,
-                                     umode_t mode);
+                                     umode_t mode, int *opened);
 extern int ceph_release(struct inode *inode, struct file *filp);
 
 /* dir.c */