mds: flock: fix F_GETLK

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

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 869f37734419f252c43408ca6b6d331528bb4d62..41862847e27d7d4cf42b6613d533098afc85046b 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -3086,6 +3086,7 @@ void Server::handle_client_file_readlock(MDRequest *mdr)
   checking_lock.length = req->head.args.filelock_change.length;
   checking_lock.client = req->get_orig_source().num();
   checking_lock.pid = req->head.args.filelock_change.pid;
+  checking_lock.pid_namespace = req->head.args.filelock_change.pid_namespace;
   checking_lock.type = req->head.args.filelock_change.type;
 
   // get the appropriate lock state

diff --git a/src/mds/flock.h b/src/mds/flock.h
index ae93d1660f076708b05b82c21912cd8d525302e0..b767fe585079e0766a26dc58cc04fc1b3b1e536f 100644 (file)
--- a/src/mds/flock.h
+++ b/src/mds/flock.h
@@ -12,7 +12,7 @@
 inline ostream& operator<<(ostream& out, ceph_filelock& l) {
   out << "start: " << l.start << ", length: " << l.length
       << ", client: " << l.client << ", pid: " << l.pid
-      << ", type: " << (int)l.type
+      << ", pid_ns: " << l.pid_namespace << ", type: " << (int)l.type
       << std::endl;
   return out;
 }