X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Flustre_dlm.h;h=fc9f390b6d2fcf1e2da426e411291c8cbf4f042c;hp=8eec429595dd034005729c9d94ee59fe755b09e8;hb=ebd53d547f83e16f29ade29cc93c1b10365a1a2a;hpb=2f83d64b5485e139e626580b1fa18630acbbb850 diff --git a/lustre/include/lustre_dlm.h b/lustre/include/lustre_dlm.h index 8eec429..fc9f390 100644 --- 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, - 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);