1. Bug fix for Bug #320, also needs repair of lconf, since it tries

[fs/lustre-release.git] / lustre / mdc / mdc_request.c

diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c
index 40a1e38..6fc0ff1 100644 (file)
--- a/lustre/mdc/mdc_request.c
+++ b/lustre/mdc/mdc_request.c
@@ -640,18 +640,12 @@ out:
 int mdc_attach(struct obd_device *dev, 
                    obd_count len, void *data)
 {
-        int rc;
-        rc = lprocfs_reg_obd(dev, (struct lprocfs_vars*)status_var_nm_1, 
-                            (void*)dev);
-        return rc; 
+        return lprocfs_reg_obd(dev, status_var_nm_1, dev);
 }
 
 int mdc_detach(struct obd_device *dev)
 {
-        int rc;
-        rc = lprocfs_dereg_obd(dev);
-        return rc;
-
+        return lprocfs_dereg_obd(dev);
 }
 struct obd_ops mdc_obd_ops = {
         o_attach: mdc_attach,
@@ -665,21 +659,13 @@ struct obd_ops mdc_obd_ops = {
 
 static int __init ptlrpc_request_init(void)
 {
-        int rc;
-        rc = class_register_type(&mdc_obd_ops, 
-                                 (struct lprocfs_vars*)status_class_var, 
-                                 LUSTRE_MDC_NAME);
-        if(rc)
-                RETURN(rc);
-        return 0;
-        
+        return class_register_type(&mdc_obd_ops, status_class_var, 
+                                   LUSTRE_MDC_NAME);
 }
 
 static void __exit ptlrpc_request_exit(void)
 {
-        
         class_unregister_type(LUSTRE_MDC_NAME);
-        
 }
 
 MODULE_AUTHOR("Cluster File Systems <info@clusterfs.com>");