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
Branch HEAD
[fs/lustre-release.git]
/
lustre
/
include
/
lustre_dlm.h
diff --git
a/lustre/include/lustre_dlm.h
b/lustre/include/lustre_dlm.h
index
8eec429
..
fc9f390
100644
(file)
--- a/
lustre/include/lustre_dlm.h
+++ b/
lustre/include/lustre_dlm.h
@@
-767,7
+767,7
@@
int ldlm_cancel_resource_local(struct ldlm_resource *res,
struct list_head *cancels,
ldlm_policy_data_t *policy,
ldlm_mode_t mode, int lock_flags,
struct list_head *cancels,
ldlm_policy_data_t *policy,
ldlm_mode_t mode, int lock_flags,
- int flags, void *opaque);
+ int
cancel_
flags, void *opaque);
int ldlm_cli_cancel_list(struct list_head *head, int count,
struct ptlrpc_request *req, int off, int flags);
int ldlm_cli_cancel_list(struct list_head *head, int count,
struct ptlrpc_request *req, int off, int flags);