branch: HEAD

backport fix from b1_8_gssfix: remove unwrap_bulk_read() from the
write path.
b=13591

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index c233574..8abd48d 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -1205,6 +1205,8 @@ static int osc_brw_fini_request(struct ptlrpc_request *req, int rc)
         if (rc < aa->aa_requested_nob)
                 handle_short_read(rc, aa->aa_page_count, aa->aa_ppga);
 
+        sptlrpc_cli_unwrap_bulk_read(req, rc, aa->aa_page_count, aa->aa_ppga);
+
         if (unlikely(body->oa.o_valid & OBD_MD_FLCKSUM)) {
                 static int cksum_counter;
                 __u32      server_cksum = body->oa.o_cksum;
@@ -1269,8 +1271,6 @@ out:
         if (rc >= 0)
                 *aa->aa_oa = body->oa;
 
-        sptlrpc_cli_unwrap_bulk_read(req, rc, aa->aa_page_count, aa->aa_ppga);
-
         RETURN(rc);
 }