From: Sam Lang <sam.lang@inktank.com>
Date: Mon, 18 Mar 2013 19:40:48 +0000 (-0500)
Subject: client:  Remove unecessary set_inode() in _rmdir()
X-Git-Tag: v0.60~46
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a13ae372c0729a25c35a7a17bc98ac732f511aaf;p=ceph.git

client:  Remove unecessary set_inode() in _rmdir()

With the recent changes in fc80c1dc6ee315ae5e039986602ffadba46cb43b,
we only allow setting the inode once on a MetaRequest.  This triggered
a bug in _rmdir(), where the parent dir inode passed in and being set
on the MetaRequest, and then also setting the dir inode on the MetaRequest.
Removing the set_inode() using the parent dir inode resolves this issue.

Signed-off-by: Sam Lang <sam.lang@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 08330e15b84..22f4a8b76db 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -7248,7 +7248,6 @@ int Client::_rmdir(Inode *dir, const char *name, int uid, int gid)
   req->dentry_drop = CEPH_CAP_FILE_SHARED;
   req->dentry_unless = CEPH_CAP_FILE_EXCL;
   req->inode_drop = CEPH_CAP_LINK_SHARED | CEPH_CAP_LINK_EXCL;
-  req->set_inode(dir);
 
   Dentry *de;
   int res = get_or_create(dir, name, &de);