X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fldlm%2Fldlm_plain.c;h=4fb9123d213032ddc826fd4a088bc2ae1c0260e2;hb=69da95e2e314e42eaf14d7c686536d0dc8d2ba5b;hp=9a693e3899dda68c926d9aa9af477a7c3d4bc3b9;hpb=ff17cc7e0282d9b1522810e0c5d12171c4d46a2d;p=fs%2Flustre-release.git diff --git a/lustre/ldlm/ldlm_plain.c b/lustre/ldlm/ldlm_plain.c index 9a693e3..4fb9123 100644 --- a/lustre/ldlm/ldlm_plain.c +++ b/lustre/ldlm/ldlm_plain.c @@ -1,32 +1,50 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Copyright (c) 2002, 2003 Cluster File Systems, Inc. - * Author: Peter Braam - * Author: Phil Schwan + * GPL HEADER START * - * This file is part of Lustre, http://www.lustre.org. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Lustre is free 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 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. * - * 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 - * GNU General Public License for more details. + * 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). * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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]. + * + * 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 2008 Sun Microsystems, Inc. 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. + * + * lustre/ldlm/ldlm_plain.c + * + * Author: Peter Braam + * Author: Phil Schwan */ #define DEBUG_SUBSYSTEM S_LDLM #ifdef __KERNEL__ -#include -#include -#include +#include +#include +#include #else #include #endif @@ -35,7 +53,7 @@ static inline int ldlm_plain_compat_queue(struct list_head *queue, struct ldlm_lock *req, - int send_cbs) + struct list_head *work_list) { struct list_head *tmp; struct ldlm_lock *lock; @@ -51,15 +69,33 @@ ldlm_plain_compat_queue(struct list_head *queue, struct ldlm_lock *req, if (req == lock) RETURN(compat); - if (lockmode_compat(lock->l_req_mode, req_mode)) + /* last lock in mode group */ + tmp = &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 (!send_cbs) + 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, NULL, 0); + ldlm_add_ast_work_item(lock, req, work_list); + + { + struct list_head *head; + + head = &lock->l_sl_mode; + list_for_each_entry(lock, head, l_sl_mode) + if (lock->l_blocking_ast) + ldlm_add_ast_work_item(lock, req, + work_list); + } } RETURN(compat); @@ -67,43 +103,39 @@ ldlm_plain_compat_queue(struct list_head *queue, struct ldlm_lock *req, /* If first_enq is 0 (ie, called from ldlm_reprocess_queue): * - blocking ASTs have already been sent - * - the caller has already initialized req->lr_tmp - * - must call this function with the ns lock held + * - must call this function with the resource lock held * * If first_enq is 1 (ie, called from ldlm_lock_enqueue): * - blocking ASTs have not been sent - * - the caller has NOT initialized req->lr_tmp, so we must - * - must call this function with the ns lock held once */ + * - 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) + ldlm_error_t *err, struct list_head *work_list) { struct ldlm_resource *res = lock->l_resource; - struct list_head rpc_list = LIST_HEAD_INIT(rpc_list); + CFS_LIST_HEAD(rpc_list); int rc; ENTRY; + check_res_locked(res); LASSERT(list_empty(&res->lr_converting)); if (!first_enq) { - LASSERT(res->lr_tmp != NULL); - rc = ldlm_plain_compat_queue(&res->lr_granted, lock, 0); + LASSERT(work_list != NULL); + rc = ldlm_plain_compat_queue(&res->lr_granted, lock, NULL); if (!rc) RETURN(LDLM_ITER_STOP); - rc = ldlm_plain_compat_queue(&res->lr_waiting, lock, 0); + rc = ldlm_plain_compat_queue(&res->lr_waiting, lock, NULL); if (!rc) RETURN(LDLM_ITER_STOP); ldlm_resource_unlink_lock(lock); - ldlm_grant_lock(lock, NULL, 0, 1); + ldlm_grant_lock(lock, work_list); RETURN(LDLM_ITER_CONTINUE); } restart: - LASSERT(res->lr_tmp == NULL); - res->lr_tmp = &rpc_list; - rc = ldlm_plain_compat_queue(&res->lr_granted, lock, 1); - rc += ldlm_plain_compat_queue(&res->lr_waiting, lock, 1); - res->lr_tmp = NULL; + rc = ldlm_plain_compat_queue(&res->lr_granted, lock, &rpc_list); + rc += ldlm_plain_compat_queue(&res->lr_waiting, lock, &rpc_list); if (rc != 2) { /* If either of the compat_queue()s returned 0, then we @@ -114,15 +146,15 @@ int ldlm_process_plain_lock(struct ldlm_lock *lock, int *flags, int first_enq, * re-ordered! Causes deadlock, because ASTs aren't sent! */ if (list_empty(&lock->l_res_link)) ldlm_resource_add_lock(res, &res->lr_waiting, lock); - l_unlock(&res->lr_namespace->ns_lock); - rc = ldlm_run_ast_work(res->lr_namespace, &rpc_list); - l_lock(&res->lr_namespace->ns_lock); + unlock_res(res); + rc = ldlm_run_ast_work(&rpc_list, LDLM_WORK_BL_AST); + lock_res(res); if (rc == -ERESTART) GOTO(restart, -ERESTART); *flags |= LDLM_FL_BLOCK_GRANTED; } else { ldlm_resource_unlink_lock(lock); - ldlm_grant_lock(lock, NULL, 0, 0); + ldlm_grant_lock(lock, NULL); } RETURN(0); }