-/* -*- 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 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.
*/
/*
#define DEBUG_SUBSYSTEM S_LDLM
#ifdef __KERNEL__
#include <libcfs/libcfs.h>
-#else
+#else
#include <liblustre.h>
#endif
*/
struct ldlm_resource * lock_res_and_lock(struct ldlm_lock *lock)
{
- struct ldlm_resource *res = NULL;
+ /* on server-side resource of lock doesn't change */
+ if (!lock->l_ns_srv)
+ cfs_spin_lock(&lock->l_lock);
- spin_lock(&lock->l_lock);
- res = lock->l_resource;
+ lock_res(lock->l_resource);
- if (ns_is_server(res->lr_namespace))
- /* on server-side resource of lock doesn't change */
- spin_unlock(&lock->l_lock);
-
- 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);