X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fofd%2Fofd_dlm.c;h=8e3fe937c7441384830adf683921418197c9ab7b;hb=dd392dfbfb1a71423f18166a56e43d9234c739d7;hp=76e2bd70509bbc5f4e2038e8eb39f128f84258fb;hpb=2f103489f6148d7fc12425dc9d0e3b0c5f8e9055;p=fs%2Flustre-release.git diff --git a/lustre/ofd/ofd_dlm.c b/lustre/ofd/ofd_dlm.c index 76e2bd7..8e3fe93 100644 --- a/lustre/ofd/ofd_dlm.c +++ b/lustre/ofd/ofd_dlm.c @@ -23,7 +23,7 @@ * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2012, 2015, Intel Corporation. + * Copyright (c) 2012, 2017, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -119,7 +119,6 @@ static enum interval_iter ofd_intent_cb(struct interval_node *n, void *args) /* Find the 'victim' lock from this interval */ list_for_each_entry(lck, &node->li_group, l_sl_policy) { - victim_lock = LDLM_LOCK_GET(lck); /* the same policy group - every lock has the @@ -213,9 +212,9 @@ out: * \retval ELDLM_LOCK_ABORTED in other cases except error * \retval negative errno on error */ -int ofd_intent_policy(struct ldlm_namespace *ns, struct ldlm_lock **lockp, - void *req_cookie, enum ldlm_mode mode, __u64 flags, - void *data) +int ofd_intent_policy(const struct lu_env *env, struct ldlm_namespace *ns, + struct ldlm_lock **lockp, void *req_cookie, + enum ldlm_mode mode, __u64 flags, void *data) { struct ptlrpc_request *req = req_cookie; struct ldlm_lock *lock = *lockp;