From af9e1672303509eee9867d52196dfbb32b69f8bb Mon Sep 17 00:00:00 2001 From: rread Date: Wed, 12 Nov 2003 21:16:28 +0000 Subject: [PATCH] b=2244 r=shaver Pass force flag to ldlm_cleanup. --- lustre/ldlm/ldlm_lib.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c index b1789af..8551c86 100644 --- a/lustre/ldlm/ldlm_lib.c +++ b/lustre/ldlm/ldlm_lib.c @@ -187,7 +187,7 @@ int client_obd_setup(struct obd_device *obddev, obd_count len, void *buf) err_import: class_destroy_import(imp); err_ldlm: - ldlm_put_ref(); + ldlm_put_ref(0); err: RETURN(rc); @@ -209,7 +209,7 @@ int client_obd_cleanup(struct obd_device *obddev, int flags) class_destroy_import(cli->cl_import); cli->cl_import = NULL; - ldlm_put_ref(); + ldlm_put_ref(flags & OBD_OPT_FORCE); RETURN(0); } @@ -267,7 +267,7 @@ int client_connect_import(struct lustre_handle *dlm_handle, if (rc) { out_ldlm: - ldlm_namespace_free(obd->obd_namespace); + ldlm_namespace_free(obd->obd_namespace, 0); obd->obd_namespace = NULL; out_disco: cli->cl_conn_count--; @@ -313,7 +313,7 @@ int client_disconnect_export(struct obd_export *exp, int failover) /* obd_no_recov == local only */ ldlm_cli_cancel_unused(obd->obd_namespace, NULL, obd->obd_no_recov, NULL); - ldlm_namespace_free(obd->obd_namespace); + ldlm_namespace_free(obd->obd_namespace, obd->obd_no_recov); obd->obd_namespace = NULL; } -- 1.8.3.1