Merge of b_md to HEAD:

[fs/lustre-release.git] / lustre / ost / ost_handler.c

diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c
index ced4655..2d47fcd 100644 (file)
--- a/lustre/ost/ost_handler.c
+++ b/lustre/ost/ost_handler.c
@@ -303,13 +303,9 @@ out_bulk:
 out_local:
         OBD_FREE(local_nb, sizeof(*local_nb) * niocount);
 out:
-        if (rc) {
-                /* It's a lot of work to delay allocating the reply, and a lot
-                 * less work to just free it here. */
-                OBD_FREE(req->rq_repmsg, req->rq_replen);
-                req->rq_repmsg = NULL;
+        if (rc)
                 ptlrpc_error(req->rq_svc, req);
-        } else
+        else
                 ptlrpc_reply(req->rq_svc, req);
         RETURN(rc);
 }