These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / lustre / lustre / ldlm / l_lock.c

diff --git a/kernel/drivers/staging/lustre/lustre/ldlm/l_lock.c b/kernel/drivers/staging/lustre/lustre/ldlm/l_lock.c
index cd8ab40..e5d1344 100644 (file)
--- a/kernel/drivers/staging/lustre/lustre/ldlm/l_lock.c
+++ b/kernel/drivers/staging/lustre/lustre/ldlm/l_lock.c
@@ -50,9 +50,7 @@
  */
 struct ldlm_resource *lock_res_and_lock(struct ldlm_lock *lock)
 {
-       /* on server-side resource of lock doesn't change */
-       if ((lock->l_flags & LDLM_FL_NS_SRV) == 0)
-               spin_lock(&lock->l_lock);
+       spin_lock(&lock->l_lock);
 
        lock_res(lock->l_resource);
 
@@ -70,7 +68,6 @@ void unlock_res_and_lock(struct ldlm_lock *lock)
        lock->l_flags &= ~LDLM_FL_RES_LOCKED;
 
        unlock_res(lock->l_resource);
-       if ((lock->l_flags & LDLM_FL_NS_SRV) == 0)
-               spin_unlock(&lock->l_lock);
+       spin_unlock(&lock->l_lock);
 }
 EXPORT_SYMBOL(unlock_res_and_lock);