LU-6017 obd: remove destroy cookie handling

[fs/lustre-release.git] / lustre / target / tgt_handler.c

diff --git a/lustre/target/tgt_handler.c b/lustre/target/tgt_handler.c
index 4f552b7..c06bb18 100644 (file)
--- a/lustre/target/tgt_handler.c
+++ b/lustre/target/tgt_handler.c
@@ -1750,7 +1750,7 @@ int tgt_brw_read(struct tgt_session_info *tsi)
 
        npages = PTLRPC_MAX_BRW_PAGES;
        rc = obd_preprw(tsi->tsi_env, OBD_BRW_READ, exp, &repbody->oa, 1,
-                       ioo, remote_nb, &npages, local_nb, NULL);
+                       ioo, remote_nb, &npages, local_nb);
        if (rc != 0)
                GOTO(out_lock, rc);
 
@@ -1809,9 +1809,8 @@ int tgt_brw_read(struct tgt_session_info *tsi)
 
 out_commitrw:
        /* Must commit after prep above in all cases */
-       rc = obd_commitrw(tsi->tsi_env, OBD_BRW_READ, exp,
-                         &repbody->oa, 1, ioo, remote_nb, npages, local_nb,
-                         NULL, rc);
+       rc = obd_commitrw(tsi->tsi_env, OBD_BRW_READ, exp, &repbody->oa, 1, ioo,
+                         remote_nb, npages, local_nb, rc);
        if (rc == 0)
                tgt_drop_id(exp, &repbody->oa);
 out_lock:
@@ -2016,7 +2015,7 @@ int tgt_brw_write(struct tgt_session_info *tsi)
 
        npages = PTLRPC_MAX_BRW_PAGES;
        rc = obd_preprw(tsi->tsi_env, OBD_BRW_WRITE, exp, &repbody->oa,
-                       objcount, ioo, remote_nb, &npages, local_nb, NULL);
+                       objcount, ioo, remote_nb, &npages, local_nb);
        if (rc < 0)
                GOTO(out_lock, rc);
 
@@ -2070,8 +2069,7 @@ skip_transfer:
 
        /* Must commit after prep above in all cases */
        rc = obd_commitrw(tsi->tsi_env, OBD_BRW_WRITE, exp, &repbody->oa,
-                         objcount, ioo, remote_nb, npages, local_nb, NULL,
-                         rc);
+                         objcount, ioo, remote_nb, npages, local_nb, rc);
        if (rc == -ENOTCONN)
                /* quota acquire process has been given up because
                 * either the client has been evicted or the client