X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fldlm%2Fl_lock.c;h=124f8349f64859d8f451a52b262d0384d32ae754;hb=682f3e19473b91f6face2567513b25a7b6d3fc24;hp=ac268ecd8320067bb765f959778f6691371f8c32;hpb=6869932b552ac705f411de3362f01bd50c1f6f7d;p=fs%2Flustre-release.git

diff --git a/lustre/ldlm/l_lock.c b/lustre/ldlm/l_lock.c
index ac268ec..124f834 100644
--- a/lustre/ldlm/l_lock.c
+++ b/lustre/ldlm/l_lock.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +24,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -37,7 +35,7 @@
 #define DEBUG_SUBSYSTEM S_LDLM
 #ifdef __KERNEL__
 #include <libcfs/libcfs.h>
-#else 
+#else
 #include <liblustre.h>
 #endif
 
@@ -52,30 +50,24 @@
  */
 struct ldlm_resource * lock_res_and_lock(struct ldlm_lock *lock)
 {
-        struct ldlm_resource *res = lock->l_resource;
+	/* on server-side resource of lock doesn't change */
+	if (!lock->l_ns_srv)
+		cfs_spin_lock(&lock->l_lock);
 
-        if (ns_is_server(res->lr_namespace)) {
-                /* on server-side resource of lock doesn't change */
-                lock_res(res);
-                return res;
-        } 
+	lock_res(lock->l_resource);
 
-        spin_lock(&lock->l_lock);
-        res = lock->l_resource;
-        lock_res(res);
-        return res;
+	lock->l_res_locked = 1;
+	return lock->l_resource;
 }
+EXPORT_SYMBOL(lock_res_and_lock);
 
 void unlock_res_and_lock(struct ldlm_lock *lock)
 {
-        struct ldlm_resource *res = lock->l_resource;
-
-        if (ns_is_server(res->lr_namespace)) {
-                /* on server-side resource of lock doesn't change */
-                unlock_res(res);
-                return;
-        }
+	/* on server-side resource of lock doesn't change */
+	lock->l_res_locked = 0;
 
-        unlock_res(res);
-        spin_unlock(&lock->l_lock);
+	unlock_res(lock->l_resource);
+	if (!lock->l_ns_srv)
+		cfs_spin_unlock(&lock->l_lock);
 }
+EXPORT_SYMBOL(unlock_res_and_lock);