From: John Spray <jspray@redhat.com>
Date: Sun, 7 Aug 2016 14:49:20 +0000 (+0100)
Subject: Merge pull request #9566 from ffilz/master
X-Git-Tag: ses5-milestone5~198
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=df32a8b4a9f9da447e784994f217d2bbf6fa59ce;p=ceph.git

Merge pull request #9566 from ffilz/master

Add ceph_ll_setlk and ceph_ll_getlk

Reviewed-by: John Spray <john.spray@redhat.com>
---

df32a8b4a9f9da447e784994f217d2bbf6fa59ce
diff --cc src/test/libcephfs/CMakeLists.txt
index dac0407f77e0,390710a3ffbe..d2642cf4af91
--- a/src/test/libcephfs/CMakeLists.txt
+++ b/src/test/libcephfs/CMakeLists.txt
@@@ -5,7 -5,9 +5,8 @@@ if(${WITH_CEPHFS}
      caps.cc
      multiclient.cc
      flock.cc
+     recordlock.cc
      acl.cc
 -    access.cc
    )
    set_target_properties(ceph_test_libcephfs PROPERTIES COMPILE_FLAGS
      ${UNITTEST_CXX_FLAGS})