From 9e1dfc8f9c00e85aad1da470021253b3cb23fc5f Mon Sep 17 00:00:00 2001 From: phil Date: Wed, 3 Sep 2003 07:13:07 +0000 Subject: [PATCH] Remove the now-unused 'data' field from lock_match --- lustre/mdc/mdc_locks.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c index 78c80da..118d070 100644 --- a/lustre/mdc/mdc_locks.c +++ b/lustre/mdc/mdc_locks.c @@ -401,11 +401,10 @@ EXPORT_SYMBOL(mdc_enqueue); * Else, if DISP_LOOKUP_EXECD then d.lustre.it_status is the rc of the * child lookup. */ -int mdc_intent_lock(struct obd_export *exp, struct ll_uctxt *uctxt, - struct ll_fid *pfid, - const char *name, int len, struct ll_fid *cfid, - struct lookup_intent *it, int flags, - struct ptlrpc_request **reqp, +int mdc_intent_lock(struct obd_export *exp, struct ll_uctxt *uctxt, + struct ll_fid *pfid, const char *name, int len, + struct ll_fid *cfid, struct lookup_intent *it, int flags, + struct ptlrpc_request **reqp, ldlm_blocking_callback cb_blocking) { struct lustre_handle lockh; @@ -433,13 +432,13 @@ int mdc_intent_lock(struct obd_export *exp, struct ll_uctxt *uctxt, mode = LCK_PR; rc = ldlm_lock_match(exp->exp_obd->obd_namespace, flags, - &res_id, LDLM_PLAIN, NULL, 0, LCK_PR, NULL, + &res_id, LDLM_PLAIN, NULL, 0, LCK_PR, &lockh); if (!rc) { mode = LCK_PW; rc = ldlm_lock_match(exp->exp_obd->obd_namespace, flags, &res_id, LDLM_PLAIN, NULL, 0, - LCK_PW, NULL, &lockh); + LCK_PW, &lockh); } if (rc) { memcpy(&it->d.lustre.it_lock_handle, &lockh, @@ -537,8 +536,7 @@ int mdc_intent_lock(struct obd_export *exp, struct ll_uctxt *uctxt, LDLM_LOCK_PUT(lock); memcpy(&old_lock, &lockh, sizeof(lockh)); if (ldlm_lock_match(NULL, LDLM_FL_BLOCK_GRANTED, NULL, - LDLM_PLAIN, NULL, 0, LCK_NL, NULL, - &old_lock)) { + LDLM_PLAIN, NULL, 0, LCK_NL, &old_lock)) { ldlm_lock_decref_and_cancel(&lockh, it->d.lustre.it_lock_mode); memcpy(&lockh, &old_lock, sizeof(old_lock)); -- 1.8.3.1