From: Jeff Layton <jlayton@kernel.org>
Date: Wed, 1 Aug 2018 13:05:51 +0000 (-0400)
Subject: client: check for unmounted condition before printing debug output
X-Git-Tag: v13.2.2~88^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d6802e73c80787e3ec632e08d38b3d6e9682a2f7;p=ceph.git

client: check for unmounted condition before printing debug output

If the filesystem was unmounted before we attempt to call ceph_ll_close
on a Fh, then we can end up tripping over the dereferences in the
debug output. Check for unmounted filesystem first, and only print
the debug info if it's still mounted.

This patch only fixes up ceph_ll_close, which is the only call ganesha
makes after calling ceph_abort_conn. We may need to fix other paths in
the future though if that ever changes.

Tracker: http://tracker.ceph.com/issues/25213
Signed-off-by: Jeff Layton <jlayton@kernel.org>
(cherry picked from commit 3c94f23d3b10928615a0f1381eb758006db84b13)
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 13258bce90e..06c4ad3b9ff 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -13177,14 +13177,15 @@ int Client::fallocate(int fd, int mode, loff_t offset, loff_t length)
 int Client::ll_release(Fh *fh)
 {
   Mutex::Locker lock(client_lock);
+
+  if (unmounting)
+    return -ENOTCONN;
+
   ldout(cct, 3) << __func__ << " (fh)" << fh << " " << fh->inode->ino << " " <<
     dendl;
   tout(cct) << __func__ << " (fh)" << std::endl;
   tout(cct) << (unsigned long)fh << std::endl;
 
-  if (unmounting)
-    return -ENOTCONN;
-
   if (ll_unclosed_fh_set.count(fh))
     ll_unclosed_fh_set.erase(fh);
   return _release_fh(fh);