Merge pull request #1410 from ceph/wip-flock

mds: fix owner check of file lock

Reviewed-by: Sage Weil <sage@inktank.com>

diff --cc src/include/ceph_fs.h
Simple merge

diff --cc src/mds/Server.cc
Simple merge

diff --cc wireshark/ceph/ceph_fs.h
Simple merge