Merge pull request #13459 from ukernel/jewel-18708

jewel: mds: fix incorrect assertion in Server::_dir_is_nonempty() Reviewed-by: John Spray <john.spray@redhat.com>
ceph · Feb 21, 2017 · 04a8492 · 04a8492
2 parents d10a8e6 + ebb2f73
commit 04a8492
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/mds/Server.cc b/src/mds/Server.cc
@@ -6010,7 +6010,7 @@ bool Server::_dir_is_nonempty(MDRequestRef& mdr, CInode *in)
 {
   dout(10) << "dir_is_nonempty " << *in << dendl;
   assert(in->is_auth());
-  assert(in->filelock.can_read(-1));
+  assert(in->filelock.can_read(mdr->get_client()));
 
   frag_info_t dirstat;
   version_t dirstat_version = in->get_projected_inode()->dirstat.version;