/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
* vim:expandtab:shiftwidth=8:tabstop=8:
*
- * Copyright (C) 2001, 2002 Cluster File Systems, Inc.
+ * GPL HEADER START
*
- * This file is part of the Lustre file system, http://www.lustre.org
- * Lustre is a trademark of Cluster File Systems, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * You may have signed or agreed to another license before downloading
- * this software. If so, you are bound by the terms and conditions
- * of that agreement, and the following does not apply to you. See the
- * LICENSE file included with this distribution for more information.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
*
- * If you did not agree to a different license, then this copy of Lustre
- * is open source software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
*
- * In either case, Lustre is distributed in the hope that it will be
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * license text for more details.
+ * 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.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
*/
#define DEBUG_SUBSYSTEM S_LDLM
*/
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 (!res->lr_namespace->ns_client) {
- /* 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 (!res->lr_namespace->ns_client) {
- /* 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);
}
-