Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-2144 utils: reset 'optind' to avoid segmentation fault
[fs/lustre-release.git]
/
lustre
/
ldlm
/
ldlm_plain.c
diff --git
a/lustre/ldlm/ldlm_plain.c
b/lustre/ldlm/ldlm_plain.c
index
7cac918
..
8cbb2e8
100644
(file)
--- a/
lustre/ldlm/ldlm_plain.c
+++ b/
lustre/ldlm/ldlm_plain.c
@@
-1,6
+1,4
@@
-/* -*- 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 START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@
-28,6
+26,8
@@
/*
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
/*
* 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/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-51,6
+51,7
@@
#include "ldlm_internal.h"
#include "ldlm_internal.h"
+#ifdef HAVE_SERVER_SUPPORT
static inline int
ldlm_plain_compat_queue(cfs_list_t *queue, struct ldlm_lock *req,
cfs_list_t *work_list)
static inline int
ldlm_plain_compat_queue(cfs_list_t *queue, struct ldlm_lock *req,
cfs_list_t *work_list)
@@
-147,7
+148,8
@@
int ldlm_process_plain_lock(struct ldlm_lock *lock, int *flags, int first_enq,
if (cfs_list_empty(&lock->l_res_link))
ldlm_resource_add_lock(res, &res->lr_waiting, lock);
unlock_res(res);
if (cfs_list_empty(&lock->l_res_link))
ldlm_resource_add_lock(res, &res->lr_waiting, lock);
unlock_res(res);
- rc = ldlm_run_ast_work(&rpc_list, LDLM_WORK_BL_AST);
+ 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);
lock_res(res);
if (rc == -ERESTART)
GOTO(restart, -ERESTART);
@@
-158,6
+160,7
@@
int ldlm_process_plain_lock(struct ldlm_lock *lock, int *flags, int first_enq,
}
RETURN(0);
}
}
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)
void ldlm_plain_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,
ldlm_policy_data_t *lpolicy)