From 5bbf1abc1818ca0c19c029bdcf2ae6b3f802f906 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <mszeredi@suse.cz>
Date: Tue, 5 Jun 2012 15:10:24 +0200
Subject: [PATCH] --- yaml --- r: 312895 b: refs/heads/master c:
 3819219b592159725069eb16a7a46f58e4ecef32 h: refs/heads/master i:   312893:
 06d9f0e108c41c2162fa96b505d1d4d7deb1cf8c   312891:
 3e7fc08642ca120affac6ed27c887e41d28c0235   312887:
 9aed925f071464df08794dc9536bf1ad4ba01b1f   312879:
 b8be360c3fc96e294e6e21c8052ceb744e8b1289   312863:
 922541b55cbde26a67f2f31dfcc532779adb0d18   312831:
 fe104cd7ef3f0086f6876cc3bae2b88bbdbf5832 v: v3

---
 [refs]                | 2 +-
 trunk/fs/ceph/dir.c   | 4 ++--
 trunk/fs/ceph/file.c  | 3 +--
 trunk/fs/ceph/super.h | 3 +--
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index ac278461c9f3..f6da8ea157f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2c127197dfc0b2bae62a52e1e0d3e3ff493919e
+refs/heads/master: 3819219b592159725069eb16a7a46f58e4ecef32
diff --git a/trunk/fs/ceph/dir.c b/trunk/fs/ceph/dir.c
index 3e8094be4604..c4b7832c38b5 100644
--- a/trunk/fs/ceph/dir.c
+++ b/trunk/fs/ceph/dir.c
@@ -599,7 +599,7 @@ static struct dentry *ceph_lookup(struct inode *dir, struct dentry *dentry,
 	    (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);
+		return ceph_lookup_open(dir, dentry, nd, mode);
 	}
 
 	/* can we conclude ENOENT locally? */
@@ -710,7 +710,7 @@ static int ceph_create(struct inode *dir, struct dentry *dentry, umode_t mode,
 
 	if (nd) {
 		BUG_ON((nd->flags & LOOKUP_OPEN) == 0);
-		dentry = ceph_lookup_open(dir, dentry, nd, mode, 0);
+		dentry = ceph_lookup_open(dir, dentry, nd, mode);
 		/* hrm, what should i do here if we get aliased? */
 		if (IS_ERR(dentry))
 			return PTR_ERR(dentry);
diff --git a/trunk/fs/ceph/file.c b/trunk/fs/ceph/file.c
index 988d4f302e48..4bf9773e6a36 100644
--- a/trunk/fs/ceph/file.c
+++ b/trunk/fs/ceph/file.c
@@ -219,8 +219,7 @@ int ceph_open(struct inode *inode, struct file *file)
  *  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)
+				struct nameidata *nd, int mode)
 {
 	struct ceph_fs_client *fsc = ceph_sb_to_client(dir->i_sb);
 	struct ceph_mds_client *mdsc = fsc->mdsc;
diff --git a/trunk/fs/ceph/super.h b/trunk/fs/ceph/super.h
index fc35036d258d..8471db98b62c 100644
--- a/trunk/fs/ceph/super.h
+++ b/trunk/fs/ceph/super.h
@@ -807,8 +807,7 @@ extern int ceph_copy_from_page_vector(struct page **pages,
 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);
+				       struct nameidata *nd, int mode);
 extern int ceph_release(struct inode *inode, struct file *filp);
 
 /* dir.c */