diff options
| author | John L. Hammond <john.hammond@intel.com> | 2014-09-05 15:08:13 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-08 12:37:04 -0700 |
| commit | 8d3d984825a83fcf8983a7fe05bdd11aaf716ab7 (patch) | |
| tree | d7a7b4e8a9c585d8fefdda48e4e2fd5892e9b3b9 | |
| parent | 903af1188e953fee851951cf528e3edc794cbe8a (diff) | |
staging/lustre/mgc: inline mgc_cancel()
The function mgc_cancel() is never invoked as an OBD device method and
is only called directly from mgc_process_log() so remove it.
Signed-off-by: John L. Hammond <john.hammond@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/lustre/lustre/mgc/mgc_request.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/drivers/staging/lustre/lustre/mgc/mgc_request.c b/drivers/staging/lustre/lustre/mgc/mgc_request.c index 970e91cb44f5..cb0e6f9de824 100644 --- a/drivers/staging/lustre/lustre/mgc/mgc_request.c +++ b/drivers/staging/lustre/lustre/mgc/mgc_request.c @@ -904,14 +904,6 @@ static int mgc_enqueue(struct obd_export *exp, struct lov_stripe_md *lsm, return rc; } -static int mgc_cancel(struct obd_export *exp, struct lov_stripe_md *md, - __u32 mode, struct lustre_handle *lockh) -{ - ldlm_lock_decref(lockh, mode); - - return 0; -} - static void mgc_notify_active(struct obd_device *unused) { /* wakeup mgc_requeue_thread to requeue mgc lock */ @@ -1679,12 +1671,8 @@ int mgc_process_log(struct obd_device *mgc, struct config_llog_data *cld) mutex_unlock(&cld->cld_lock); /* Now drop the lock so MGS can revoke it */ - if (!rcl) { - rcl = mgc_cancel(mgc->u.cli.cl_mgc_mgsexp, NULL, - LCK_CR, &lockh); - if (rcl) - CERROR("Can't drop cfg lock: %d\n", rcl); - } + if (!rcl) + ldlm_lock_decref(&lockh, LCK_CR); return rc; } @@ -1814,7 +1802,6 @@ struct obd_ops mgc_obd_ops = { .o_connect = client_connect_import, .o_disconnect = client_disconnect_export, /* .o_enqueue = mgc_enqueue, */ - .o_cancel = mgc_cancel, /* .o_iocontrol = mgc_iocontrol, */ .o_set_info_async = mgc_set_info_async, .o_get_info = mgc_get_info, |