* in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
+ * 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
* 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.
*/
/*
*/
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;
- }
-
- spin_lock(&lock->l_lock);
- res = lock->l_resource;
- lock_res(res);
- return res;
+ lock_res(lock->l_resource);
+ return lock->l_resource;
}
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;
- }
-
- unlock_res(res);
- spin_unlock(&lock->l_lock);
+ /* on server-side resource of lock doesn't change */
+ unlock_res(lock->l_resource);
+ if (!lock->l_ns_srv)
+ cfs_spin_unlock(&lock->l_lock);
}