From: alex <alex>
Date: Fri, 10 Jul 2009 11:42:09 +0000 (+0000)
Subject: - cvs merge is funny. sometimes.
X-Git-Tag: GIT_EPOCH_B_HD_KDMU~2^4~80
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=987bfcef831294e9d2b6beef3df1153b8ba44611;p=fs%2Flustre-release.git

- cvs merge is funny. sometimes.
---

diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c
index ec6286e..e28e915 100644
--- a/lustre/ost/ost_handler.c
+++ b/lustre/ost/ost_handler.c
@@ -992,26 +992,6 @@ static int ost_brw_write(struct ptlrpc_request *req, struct obd_trans_info *oti)
         if (rc != 0)
                 GOTO(out_lock, rc);
 
-        rc = sptlrpc_svc_prep_bulk(req, desc);
-        if (rc != 0)
-                GOTO(out_lock, rc);
-
-        rc = sptlrpc_svc_prep_bulk(req, desc);
-        if (rc != 0)
-                GOTO(out_lock, rc);
-
-        rc = sptlrpc_svc_prep_bulk(req, desc);
-        if (rc != 0)
-                GOTO(out_lock, rc);
-
-        rc = sptlrpc_svc_prep_bulk(req, desc);
-        if (rc != 0)
-                GOTO(out_lock, rc);
-
-        rc = sptlrpc_svc_prep_bulk(req, desc);
-        if (rc != 0)
-                GOTO(out_lock, rc);
-
         /* Check if client was evicted while we were doing i/o before touching
            network */
         if (desc->bd_export->exp_failed)