diff options
| author | Yan, Zheng <zheng.z.yan@intel.com> | 2013-10-14 16:34:26 +0800 |
|---|---|---|
| committer | Yan, Zheng <zheng.z.yan@intel.com> | 2013-10-14 16:39:48 +0800 |
| commit | f5685013a4ff4f569413945f380dd48b6cdbfaad (patch) | |
| tree | 8d51e184ec2c111f916dadd1e2e806372bc92ab3 | |
| parent | 8d8ae58c420d880989c9430074be9f7710f6c74f (diff) | |
| download | ceph-wip-5025.tar.gz | |
mds: flock: fix F_GETLKwip-5025
fixes #5025
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
| -rw-r--r-- | src/mds/Server.cc | 1 | ||||
| -rw-r--r-- | src/mds/flock.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 869f3773441..41862847e27 100644 --- 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 ae93d1660f0..b767fe58507 100644 --- 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; } |