Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-12616 obclass: fix MDS start/stop race
[fs/lustre-release.git]
/
lustre
/
ldlm
/
l_lock.c
diff --git
a/lustre/ldlm/l_lock.c
b/lustre/ldlm/l_lock.c
index
cb08f5b
..
a4f7c85
100644
(file)
--- 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.
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@
-17,17
+15,15
@@
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
*
* GPL HEADER END
*/
/*
*
* 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.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-35,46
+31,42
@@
*/
#define DEBUG_SUBSYSTEM S_LDLM
*/
#define DEBUG_SUBSYSTEM S_LDLM
-#ifdef __KERNEL__
#include <libcfs/libcfs.h>
#include <libcfs/libcfs.h>
-#else
-#include <liblustre.h>
-#endif
#include <lustre_dlm.h>
#include <lustre_lib.h>
#include <lustre_dlm.h>
#include <lustre_lib.h>
-/*
- * ldlm locking uses resource to serialize access to locks
+/**
+ * Lock a lock and its resource.
+ *
+ * LDLM locking uses resource to serialize access to locks
* but there is a case when we change resource of lock upon
* but there is a case when we change resource of lock upon
- * enqueue reply.
we rely on that
lock->l_resource = new_res
- *
is atomic
+ * enqueue reply.
We rely on
lock->l_resource = new_res
+ *
being an atomic operation.
*/
*/
-struct ldlm_resource *
lock_res_and_lock(struct ldlm_lock *lock)
+struct ldlm_resource *lock_res_and_lock(struct ldlm_lock *lock)
{
{
- struct ldlm_resource *res = NULL;
-
- spin_lock(&lock->l_lock);
- res = lock->l_resource;
+ /* on server-side resource of lock doesn't change */
+ if (!ldlm_is_ns_srv(lock))
+ spin_lock(&lock->l_lock);
- if (ns_is_server(res->lr_namespace))
- /* on server-side resource of lock doesn't change */
- spin_unlock(&lock->l_lock);
+ lock_res(lock->l_resource);
-
lock_res(res
);
-
return res
;
+
ldlm_set_res_locked(lock
);
+
return lock->l_resource
;
}
}
+EXPORT_SYMBOL(lock_res_and_lock);
+/**
+ * Unlock a lock and its resource previously locked with lock_res_and_lock
+ */
void unlock_res_and_lock(struct ldlm_lock *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 */
+ ldlm_clear_res_locked(lock);
- unlock_res(res);
- spin_unlock(&lock->l_lock);
+ unlock_res(lock->l_resource);
+ if (!ldlm_is_ns_srv(lock))
+ spin_unlock(&lock->l_lock);
}
}
+EXPORT_SYMBOL(unlock_res_and_lock);