From 9144b8ecbb0c12afe8ec324765bba4bee0299202 Mon Sep 17 00:00:00 2001 From: pschwan Date: Sat, 7 Sep 2002 20:47:17 +0000 Subject: [PATCH] - lprocfs_dereg_dev is failing, which prevented cleanup. This is VERY BAD, so I made it continue with cleanup instead of aborting --- lustre/obdclass/class_obd.c | 6 ++---- lustre/obdclass/genops.c | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c index c68e44d1..5de6380 100644 --- a/lustre/obdclass/class_obd.c +++ b/lustre/obdclass/class_obd.c @@ -666,10 +666,8 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp, GOTO(out, err=-EBUSY); } - if(lprocfs_dereg_dev(obd)!=LPROCFS_SUCCESS){ - CERROR("Could not remove Proc Entry\n"); - GOTO(out, err=-ENODEV); - + if (lprocfs_dereg_dev(obd) != LPROCFS_SUCCESS) { + CERROR("Could not remove /proc entry\n"); } if (obd->obd_name) { OBD_FREE(obd->obd_name, strlen(obd->obd_name)+1); diff --git a/lustre/obdclass/genops.c b/lustre/obdclass/genops.c index a2741f2..a6dc7b8 100644 --- a/lustre/obdclass/genops.c +++ b/lustre/obdclass/genops.c @@ -20,7 +20,6 @@ #include extern struct list_head obd_types; -extern struct obd_device obd_dev[MAX_OBD_DEVICES]; kmem_cache_t *obdo_cachep = NULL; kmem_cache_t *export_cachep = NULL; kmem_cache_t *import_cachep = NULL; -- 1.8.3.1