X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fldlm%2Fldlm_plain.c;h=8cbb2e812ecb645c255987feee63351bccc6dfef;hb=0d8a372d30572077fbf943c7d3f32e3d5d7ee3d5;hp=c6b2c891dc417a1c57fdeca732bdf70392a040e4;hpb=8c82ab5cd92ee70a4cda2fe6437861e56f3fe3d5;p=fs%2Flustre-release.git diff --git a/lustre/ldlm/ldlm_plain.c b/lustre/ldlm/ldlm_plain.c index c6b2c89..8cbb2e8 100644 --- a/lustre/ldlm/ldlm_plain.c +++ b/lustre/ldlm/ldlm_plain.c @@ -1,27 +1,42 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: +/* + * GPL HEADER START * - * Copyright (c) 2002, 2003 Cluster File Systems, Inc. - * Author: Peter Braam - * Author: Phil Schwan + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * This file is part of the Lustre file system, http://www.lustre.org - * Lustre is a trademark of Cluster File Systems, Inc. + * 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. * - * 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 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). * - * 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. + * 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 * - * 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. + * 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) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * Copyright (c) 2011, Whamcloud, Inc. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. + * + * lustre/ldlm/ldlm_plain.c + * + * Author: Peter Braam + * Author: Phil Schwan */ #define DEBUG_SUBSYSTEM S_LDLM @@ -36,11 +51,12 @@ #include "ldlm_internal.h" +#ifdef HAVE_SERVER_SUPPORT static inline int -ldlm_plain_compat_queue(struct list_head *queue, struct ldlm_lock *req, - struct list_head *work_list) +ldlm_plain_compat_queue(cfs_list_t *queue, struct ldlm_lock *req, + cfs_list_t *work_list) { - struct list_head *tmp; + cfs_list_t *tmp; struct ldlm_lock *lock; ldlm_mode_t req_mode = req->l_req_mode; int compat = 1; @@ -48,38 +64,38 @@ ldlm_plain_compat_queue(struct list_head *queue, struct ldlm_lock *req, lockmode_verify(req_mode); - list_for_each(tmp, queue) { - lock = list_entry(tmp, struct ldlm_lock, l_res_link); + cfs_list_for_each(tmp, queue) { + lock = cfs_list_entry(tmp, struct ldlm_lock, l_res_link); if (req == lock) RETURN(compat); - if (lockmode_compat(lock->l_req_mode, req_mode)) { - /* jump to next mode group */ - if (LDLM_SL_HEAD(&lock->l_sl_mode)) - tmp = &list_entry(lock->l_sl_mode.next, - struct ldlm_lock, - l_sl_mode)->l_res_link; + /* last lock in mode group */ + tmp = &cfs_list_entry(lock->l_sl_mode.prev, + struct ldlm_lock, + l_sl_mode)->l_res_link; + + if (lockmode_compat(lock->l_req_mode, req_mode)) continue; - } if (!work_list) RETURN(0); compat = 0; + + /* add locks of the mode group to @work_list as + * blocking locks for @req */ if (lock->l_blocking_ast) ldlm_add_ast_work_item(lock, req, work_list); - if (LDLM_SL_HEAD(&lock->l_sl_mode)) { - /* add all members of the mode group */ - do { - tmp = lock->l_res_link.next; - lock = list_entry(tmp, struct ldlm_lock, - l_res_link); + { + cfs_list_t *head; + + head = &lock->l_sl_mode; + cfs_list_for_each_entry(lock, head, l_sl_mode) if (lock->l_blocking_ast) - ldlm_add_ast_work_item( - lock, req, work_list); - } while (!LDLM_SL_TAIL(&lock->l_sl_mode)); + ldlm_add_ast_work_item(lock, req, + work_list); } } @@ -94,15 +110,15 @@ ldlm_plain_compat_queue(struct list_head *queue, struct ldlm_lock *req, * - blocking ASTs have not been sent * - must call this function with the resource lock held */ int ldlm_process_plain_lock(struct ldlm_lock *lock, int *flags, int first_enq, - ldlm_error_t *err, struct list_head *work_list) + ldlm_error_t *err, cfs_list_t *work_list) { struct ldlm_resource *res = lock->l_resource; - struct list_head rpc_list = CFS_LIST_HEAD_INIT(rpc_list); + CFS_LIST_HEAD(rpc_list); int rc; ENTRY; check_res_locked(res); - LASSERT(list_empty(&res->lr_converting)); + LASSERT(cfs_list_empty(&res->lr_converting)); if (!first_enq) { LASSERT(work_list != NULL); @@ -129,10 +145,11 @@ int ldlm_process_plain_lock(struct ldlm_lock *lock, int *flags, int first_enq, * bug 2322: we used to unlink and re-add here, which was a * terrible folly -- if we goto restart, we could get * re-ordered! Causes deadlock, because ASTs aren't sent! */ - if (list_empty(&lock->l_res_link)) + if (cfs_list_empty(&lock->l_res_link)) ldlm_resource_add_lock(res, &res->lr_waiting, lock); unlock_res(res); - rc = ldlm_run_bl_ast_work(&rpc_list); + rc = ldlm_run_ast_work(ldlm_res_to_ns(res), &rpc_list, + LDLM_WORK_BL_AST); lock_res(res); if (rc == -ERESTART) GOTO(restart, -ERESTART); @@ -143,3 +160,16 @@ int ldlm_process_plain_lock(struct ldlm_lock *lock, int *flags, int first_enq, } RETURN(0); } +#endif /* HAVE_SERVER_SUPPORT */ + +void ldlm_plain_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy, + ldlm_policy_data_t *lpolicy) +{ + /* No policy for plain locks */ +} + +void ldlm_plain_policy_local_to_wire(const ldlm_policy_data_t *lpolicy, + ldlm_wire_policy_data_t *wpolicy) +{ + /* No policy for plain locks */ +}