LU-6158 mdt: always shrink_capsule in getxattr_all

[fs/lustre-release.git] / lustre / ldlm / l_lock.c

diff --git a/lustre/ldlm/l_lock.c b/lustre/ldlm/l_lock.c
index d0f8cfd..6f3f859 100644 (file)
--- a/lustre/ldlm/l_lock.c
+++ b/lustre/ldlm/l_lock.c
@@ -35,11 +35,7 @@
  */
 
 #define DEBUG_SUBSYSTEM S_LDLM
-#ifdef __KERNEL__
 #include <libcfs/libcfs.h>
-#else
-#include <liblustre.h>
-#endif
 
 #include <lustre_dlm.h>
 #include <lustre_lib.h>
@@ -55,12 +51,12 @@
 struct ldlm_resource *lock_res_and_lock(struct ldlm_lock *lock)
 {
        /* on server-side resource of lock doesn't change */
-       if (!lock->l_ns_srv)
+       if (!ldlm_is_ns_srv(lock))
                spin_lock(&lock->l_lock);
 
        lock_res(lock->l_resource);
 
-       lock->l_res_locked = 1;
+       ldlm_set_res_locked(lock);
        return lock->l_resource;
 }
 EXPORT_SYMBOL(lock_res_and_lock);
@@ -71,10 +67,10 @@ EXPORT_SYMBOL(lock_res_and_lock);
 void unlock_res_and_lock(struct ldlm_lock *lock)
 {
        /* on server-side resource of lock doesn't change */
-       lock->l_res_locked = 0;
+       ldlm_clear_res_locked(lock);
 
        unlock_res(lock->l_resource);
-       if (!lock->l_ns_srv)
+       if (!ldlm_is_ns_srv(lock))
                spin_unlock(&lock->l_lock);
 }
 EXPORT_SYMBOL(unlock_res_and_lock);