From: Yan, Zheng <zheng.z.yan@intel.com>
Date: Wed, 19 Mar 2014 06:26:08 +0000 (+0800)
Subject: mds: fix NULL pointer dereference in Server::handle_client_rename
X-Git-Tag: v0.79~111^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0d167d2cd0a5890ffd927b383bbe6a5f0c019e55;p=ceph.git

mds: fix NULL pointer dereference in Server::handle_client_rename

Inode's parent dentry can be NULL, which causes segment fault in
Locker::acquire_locks

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
---

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 4b6b752ccb7d..2c0f82a9825a 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -5689,9 +5689,9 @@ void Server::handle_client_rename(MDRequest *mdr)
     // open_remote_ino() with 'want_locked=true' when the srcdn or destdn
     // is traversed.
     if (srcdnl->is_remote())
-      xlocks.insert(&srci->get_parent_dn()->lock);
+      xlocks.insert(&srci->get_projected_parent_dn()->lock);
     if (destdnl->is_remote())
-      xlocks.insert(&oldin->get_parent_dn()->lock);
+      xlocks.insert(&oldin->get_projected_parent_dn()->lock);
   }
 
   // we need to update srci's ctime.  xlock its least contended lock to do that...