4 files changed, 61 insertions, 50 deletions

diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
index 6a66bd2d4da0..f391f1e75414 100644
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
@@ -575,7 +575,7 @@ static int is_root_ceph_dentry(struct inode *inode, struct dentry *dentry)
  * the MDS so that it gets our 'caps wanted' value in a single op.
  */
 static struct dentry *ceph_lookup(struct inode *dir, struct dentry *dentry,
-                                  struct nameidata *nd)
+                                  unsigned int flags)
 {
         struct ceph_fs_client *fsc = ceph_sb_to_client(dir->i_sb);
         struct ceph_mds_client *mdsc = fsc->mdsc;
@@ -593,14 +593,6 @@ static struct dentry *ceph_lookup(struct inode *dir, struct dentry *dentry,
         if (err < 0)
                 return ERR_PTR(err);
 
-        /* open (but not create!) intent? */
-        if (nd &&
-            (nd->flags & LOOKUP_OPEN) &&
-            !(nd->intent.open.flags & O_CREAT)) {
-                int mode = nd->intent.open.create_mode & ~current->fs->umask;
-                return ceph_lookup_open(dir, dentry, nd, mode, 1);
-        }
-
         /* can we conclude ENOENT locally? */
         if (dentry->d_inode == NULL) {
                 struct ceph_inode_info *ci = ceph_inode(dir);
@@ -641,13 +633,51 @@ static struct dentry *ceph_lookup(struct inode *dir, struct dentry *dentry,
         return dentry;
 }
 
+int ceph_atomic_open(struct inode *dir, struct dentry *dentry,
+                     struct file *file, unsigned flags, umode_t mode,
+                     int *opened)
+{
+        int err;
+        struct dentry *res = NULL;
+
+        if (!(flags & O_CREAT)) {
+                if (dentry->d_name.len > NAME_MAX)
+                        return -ENAMETOOLONG;
+
+                err = ceph_init_dentry(dentry);
+                if (err < 0)
+                        return err;
+
+                return ceph_lookup_open(dir, dentry, file, flags, mode, opened);
+        }
+
+        if (d_unhashed(dentry)) {
+                res = ceph_lookup(dir, dentry, 0);
+                if (IS_ERR(res))
+                        return PTR_ERR(res);
+
+                if (res)
+                        dentry = res;
+        }
+
+        /* We don't deal with positive dentries here */
+        if (dentry->d_inode)
+                return finish_no_open(file, res);
+
+        *opened |= FILE_CREATED;
+        err = ceph_lookup_open(dir, dentry, file, flags, mode, opened);
+        dput(res);
+
+        return err;
+}
+
 /*
  * If we do a create but get no trace back from the MDS, follow up with
  * a lookup (the VFS expects us to link up the provided dentry).
  */
 int ceph_handle_notrace_create(struct inode *dir, struct dentry *dentry)
 {
-        struct dentry *result = ceph_lookup(dir, dentry, NULL);
+        struct dentry *result = ceph_lookup(dir, dentry, 0);
 
         if (result && !IS_ERR(result)) {
                 /*
@@ -699,25 +729,9 @@ static int ceph_mknod(struct inode *dir, struct dentry *dentry,
 }
 
 static int ceph_create(struct inode *dir, struct dentry *dentry, umode_t mode,
-                       struct nameidata *nd)
+                       bool excl)
 {
-        dout("create in dir %p dentry %p name '%.*s'\n",
-             dir, dentry, dentry->d_name.len, dentry->d_name.name);
-
-        if (ceph_snap(dir) != CEPH_NOSNAP)
-                return -EROFS;
-
-        if (nd) {
-                BUG_ON((nd->flags & LOOKUP_OPEN) == 0);
-                dentry = ceph_lookup_open(dir, dentry, nd, mode, 0);
-                /* hrm, what should i do here if we get aliased? */
-                if (IS_ERR(dentry))
-                        return PTR_ERR(dentry);
-                return 0;
-        }
-
-        /* fall back to mknod */
-        return ceph_mknod(dir, dentry, (mode & ~S_IFMT) | S_IFREG, 0);
+        return ceph_mknod(dir, dentry, mode, 0);
 }
 
 static int ceph_symlink(struct inode *dir, struct dentry *dentry,
@@ -1027,12 +1041,12 @@ static int dir_lease_is_valid(struct inode *dir, struct dentry *dentry)
 /*
  * Check if cached dentry can be trusted.
  */
-static int ceph_d_revalidate(struct dentry *dentry, struct nameidata *nd)
+static int ceph_d_revalidate(struct dentry *dentry, unsigned int flags)
 {
         int valid = 0;
         struct inode *dir;
 
-        if (nd && nd->flags & LOOKUP_RCU)
+        if (flags & LOOKUP_RCU)
                 return -ECHILD;
 
         dout("d_revalidate %p '%.*s' inode %p offset %lld\n", dentry,
@@ -1079,7 +1093,7 @@ static void ceph_d_release(struct dentry *dentry)
 }
 
 static int ceph_snapdir_d_revalidate(struct dentry *dentry,
-                                          struct nameidata *nd)
+                                          unsigned int flags)
 {
         /*
          * Eventually, we'll want to revalidate snapped metadata
@@ -1356,6 +1370,7 @@ const struct inode_operations ceph_dir_iops = {
         .rmdir = ceph_unlink,
         .rename = ceph_rename,
         .create = ceph_create,
+        .atomic_open = ceph_atomic_open,
 };
 
 const struct dentry_operations ceph_dentry_ops = {
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 988d4f302e48..1b81d6c31878 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -213,22 +213,15 @@ out:
  * may_open() fails, the struct *file gets cleaned up (i.e.
  * ceph_release gets called).  So fear not!
  */
-/*
- * flags
- *  path_lookup_open   -> LOOKUP_OPEN
- *  path_lookup_create -> LOOKUP_OPEN|LOOKUP_CREATE
- */
-struct dentry *ceph_lookup_open(struct inode *dir, struct dentry *dentry,
-                                struct nameidata *nd, int mode,
-                                int locked_dir)
+int ceph_lookup_open(struct inode *dir, struct dentry *dentry,
+                     struct file *file, 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;
-        struct file *file;
         struct ceph_mds_request *req;
         struct dentry *ret;
         int err;
-        int flags = nd->intent.open.flags;
 
         dout("ceph_lookup_open dentry %p '%.*s' flags %d mode 0%o\n",
              dentry, dentry->d_name.len, dentry->d_name.name, flags, mode);
@@ -236,7 +229,7 @@ struct dentry *ceph_lookup_open(struct inode *dir, struct dentry *dentry,
         /* do the open */
         req = prepare_open_request(dir->i_sb, flags, mode);
         if (IS_ERR(req))
-                return ERR_CAST(req);
+                return PTR_ERR(req);
         req->r_dentry = dget(dentry);
         req->r_num_caps = 2;
         if (flags & O_CREAT) {
@@ -254,14 +247,17 @@ struct dentry *ceph_lookup_open(struct inode *dir, struct dentry *dentry,
                 err = ceph_handle_notrace_create(dir, dentry);
         if (err)
                 goto out;
-        file = lookup_instantiate_filp(nd, req->r_dentry, ceph_open);
-        if (IS_ERR(file))
-                err = PTR_ERR(file);
+        err = finish_open(file, req->r_dentry, ceph_open, opened);
 out:
         ret = ceph_finish_lookup(req, dentry, err);
         ceph_mdsc_put_request(req);
         dout("ceph_lookup_open result=%p\n", ret);
-        return ret;
+
+        if (IS_ERR(ret))
+                return PTR_ERR(ret);
+
+        dput(ret);
+        return err;
 }
 
 int ceph_release(struct inode *inode, struct file *file)
diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index 2c47ecfe4373..b982239f38f9 100644
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -872,7 +872,7 @@ static struct dentry *ceph_mount(struct file_system_type *fs_type,
 
         if (ceph_test_opt(fsc->client, NOSHARE))
                 compare_super = NULL;
-        sb = sget(fs_type, compare_super, ceph_set_super, fsc);
+        sb = sget(fs_type, compare_super, ceph_set_super, flags, fsc);
         if (IS_ERR(sb)) {
                 res = ERR_CAST(sb);
                 goto out;
diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index 3ea48b7b98b3..ebc95cc652be 100644
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -806,9 +806,9 @@ extern int ceph_copy_from_page_vector(struct page **pages,
                                     loff_t off, size_t len);
 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 dentry *ceph_lookup_open(struct inode *dir, struct dentry *dentry,
-                                       struct nameidata *nd, int mode,
-                                       int locked_dir);
+extern int ceph_lookup_open(struct inode *dir, struct dentry *dentry,
+                             struct file *od, unsigned flags,
+                             umode_t mode, int *opened);
 extern int ceph_release(struct inode *inode, struct file *filp);
 
 /* dir.c */