From: adilger <adilger>
Date: Tue, 13 Aug 2002 21:53:30 +0000 (+0000)
Subject: Minor fixups for error handling case.
X-Git-Tag: 0.5.5~159
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=c9fc0139a6baf0da47dbf33d6b92e518d370a0d1;p=fs%2Flustre-release.git

Minor fixups for error handling case.
---

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index 9c543d2..cc0d794 100644
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -409,7 +409,7 @@ static int osc_brw_read(struct lustre_handle *conn, struct lov_stripe_md *md,
          */
         rc = ptlrpc_register_bulk(desc);
         if (rc)
-                GOTO(out_desc, rc);
+                GOTO(out_unmap, rc);
 
         request->rq_replen = lustre_msg_size(1, size);
         rc = ptlrpc_queue_wait(request);
@@ -439,12 +439,12 @@ out_req:
         RETURN(rc);
 
         /* Clean up on error. */
-out_desc:
-        ptlrpc_bulk_decref(desc);
 out_unmap:
         while (mapped-- > 0)
                 kunmap(page_array[mapped]);
         OBD_FREE(cb_data, sizeof(*cb_data));
+out_desc:
+        ptlrpc_bulk_decref(desc);
         goto out_req;
 }