From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Wed, 22 May 2013 15:21:59 +0000 (+0200)
Subject: mds/Migrator.cc: fix possible dereference NULL return value
X-Git-Tag: v0.64~72^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=158e74093563a4a4bb5ac51bd58538cefbb808c0;p=ceph.git

mds/Migrator.cc: fix possible dereference NULL return value

CID 716999 (#1 of 1): Dereference null return value (NULL_RETURNS)
  dereference: Dereferencing a pointer that might be null "in" when
  calling "CInode::put_stickydirs()".

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index fd3d45c5081c..c93f76601f87 100644
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -1992,7 +1992,8 @@ void Migrator::import_remove_pins(CDir *dir, set<CDir*>& bounds)
       continue;
     did.insert(p->ino);
     CInode *in = cache->get_inode(p->ino);
-      in->put_stickydirs();
+    assert(in);
+    in->put_stickydirs();
   }
 
   if (import_state[dir->dirfrag()] >= IMPORT_PREPPED) {