From: Jeff Layton <jlayton@redhat.com>
Date: Thu, 30 May 2019 19:52:11 +0000 (-0400)
Subject: client: drop Client::lookup_parent
X-Git-Tag: v13.2.7~96^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4cdf01f185630e5eafe7700d57f40c812fd1a880;p=ceph.git

client: drop Client::lookup_parent

Nothing calls this method.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit 5c419b64755c200d43b60d1b435f09a4e5b17f7e)

Conflicts:
	src/client/Client.cc
	    - Mutex::Locker -> std::lock_guard
	src/client/Client.h
	    - contextual merge conflict
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 2b8673ff002c..020ad16c4084 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -8403,12 +8403,6 @@ int Client::_lookup_parent(Inode *ino, const UserPerm& perms, Inode **parent)
   return r;
 }
 
-int Client::lookup_parent(Inode *ino, const UserPerm& perms, Inode **parent)
-{
-  Mutex::Locker lock(client_lock);
-  return _lookup_parent(ino, perms, parent);
-}
-
 /**
  * Populate the parent dentry for `ino`, provided it is
  * a child of `parent`.
diff --git a/src/client/Client.h b/src/client/Client.h
index 9bd77dd90196..182fd93536f8 100644
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -1060,7 +1060,6 @@ public:
   int lookup_hash(inodeno_t ino, inodeno_t dirino, const char *name,
 		  const UserPerm& perms);
   int lookup_ino(inodeno_t ino, const UserPerm& perms, Inode **inode=NULL);
-  int lookup_parent(Inode *in, const UserPerm& perms, Inode **parent=NULL);
   int lookup_name(Inode *in, Inode *parent, const UserPerm& perms);
   int close(int fd);
   loff_t lseek(int fd, loff_t offset, int whence);