- Added UUID description to network document

- fixed leaked refcount in failed osc_request startup
- small debugging message fix
- removed extraneous PtlMDUnlink
- try to remove kqswnal in llmountcleanup

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index 96999f7..9fe2c30 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -579,7 +579,7 @@ static int osc_setup(struct obd_device *obddev, obd_count len,
 
         OBD_ALLOC(osc->osc_peer, sizeof(*osc->osc_peer));
         if (osc->osc_peer == NULL)
-                return -ENOMEM;
+                RETURN(-ENOMEM);
 
         rc = ptlrpc_connect_client(dev, "ost",
                                    OST_REQUEST_PORTAL,
@@ -588,9 +588,9 @@ static int osc_setup(struct obd_device *obddev, obd_count len,
                                    ost_unpack_rep,
                                    osc->osc_peer);
 
-        MOD_INC_USE_COUNT;
-        EXIT;
-        return rc;
+        if (rc == 0)
+                MOD_INC_USE_COUNT;
+        RETURN(rc);
 } 
 
 static int osc_cleanup(struct obd_device * obddev)

diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c
index 462982f..ceb1d1b 100644 (file)
--- a/lustre/ptlrpc/client.c
+++ b/lustre/ptlrpc/client.c
@@ -102,9 +102,8 @@ int ptlrpc_connect_client(int dev, char *uuid, int req_portal, int rep_portal,
 
        /* networked */
        err = kportal_uuid_to_peer(uuid, &cl->cli_server);
-       if (err != 0) { 
-               CERROR("cannot find peer %s!", uuid); 
-       }
+        if (err != 0)
+                CERROR("cannot find peer %s!\n", uuid);
 
         return err;
 }

diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c
index cb01cac..fd92578 100644 (file)
--- a/lustre/ptlrpc/service.c
+++ b/lustre/ptlrpc/service.c
@@ -351,10 +351,6 @@ int rpc_unregister_service(struct ptlrpc_service *service)
         int rc, i;
 
         for (i = 0; i < service->srv_ring_length; i++) {
-                rc = PtlMDUnlink(service->srv_md_h[i]);
-                if (rc)
-                        CERROR("PtlMDUnlink failed: %d\n", rc);
-        
                 rc = PtlMEUnlink(service->srv_me_h[i]);
                 if (rc)
                         CERROR("PtlMEUnlink failed: %d\n", rc);

diff --git a/lustre/tests/llmountcleanup.sh b/lustre/tests/llmountcleanup.sh
index 0267679..175c897 100755 (executable)
--- a/lustre/tests/llmountcleanup.sh
+++ b/lustre/tests/llmountcleanup.sh
@@ -41,6 +41,7 @@ del_uuid ost
 quit
 EOF
 
+rmmod kqswnal
 rmmod ksocknal
 killall acceptor
 rmmod portals