Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / lustre / lustre / ptlrpc / sec_plain.c

diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_plain.c b/drivers/staging/lustre/lustre/ptlrpc/sec_plain.c
index 5c4590b0c5216ac42ae5d50bed20b20d5b5fb4e0..cd305bcb334a039484fe5579fc54789fe4f4f8ed 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/sec_plain.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/sec_plain.c
@@ -154,13 +154,13 @@ static void corrupt_bulk_data(struct ptlrpc_bulk_desc *desc)
        unsigned int off, i;
 
        for (i = 0; i < desc->bd_iov_count; i++) {
-               if (desc->bd_iov[i].kiov_len == 0)
+               if (desc->bd_iov[i].bv_len == 0)
                        continue;
 
-               ptr = kmap(desc->bd_iov[i].kiov_page);
-               off = desc->bd_iov[i].kiov_offset & ~PAGE_MASK;
+               ptr = kmap(desc->bd_iov[i].bv_page);
+               off = desc->bd_iov[i].bv_offset & ~PAGE_MASK;
                ptr[off] ^= 0x1;
-               kunmap(desc->bd_iov[i].kiov_page);
+               kunmap(desc->bd_iov[i].bv_page);
                return;
        }
 }
@@ -249,9 +249,12 @@ int plain_ctx_verify(struct ptlrpc_cli_ctx *ctx, struct ptlrpc_request *req)
                unsigned int hsize = 4;
 
                cfs_crypto_hash_digest(CFS_HASH_ALG_CRC32,
-                               lustre_msg_buf(msg, PLAIN_PACK_MSG_OFF, 0),
-                               lustre_msg_buflen(msg, PLAIN_PACK_MSG_OFF),
-                               NULL, 0, (unsigned char *)&cksum, &hsize);
+                                      lustre_msg_buf(msg, PLAIN_PACK_MSG_OFF,
+                                                     0),
+                                      lustre_msg_buflen(msg,
+                                                        PLAIN_PACK_MSG_OFF),
+                                      NULL, 0, (unsigned char *)&cksum,
+                                      &hsize);
                if (cksum != msg->lm_cksum) {
                        CDEBUG(D_SEC,
                               "early reply checksum mismatch: %08x != %08x\n",
@@ -349,11 +352,11 @@ int plain_cli_unwrap_bulk(struct ptlrpc_cli_ctx *ctx,
 
        /* fix the actual data size */
        for (i = 0, nob = 0; i < desc->bd_iov_count; i++) {
-               if (desc->bd_iov[i].kiov_len + nob > desc->bd_nob_transferred) {
-                       desc->bd_iov[i].kiov_len =
+               if (desc->bd_iov[i].bv_len + nob > desc->bd_nob_transferred) {
+                       desc->bd_iov[i].bv_len =
                                desc->bd_nob_transferred - nob;
                }
-               nob += desc->bd_iov[i].kiov_len;
+               nob += desc->bd_iov[i].bv_len;
        }
 
        rc = plain_verify_bulk_csum(desc, req->rq_flvr.u_bulk.hash.hash_alg,
@@ -869,9 +872,12 @@ int plain_authorize(struct ptlrpc_request *req)
                unsigned int hsize = 4;
 
                cfs_crypto_hash_digest(CFS_HASH_ALG_CRC32,
-                       lustre_msg_buf(msg, PLAIN_PACK_MSG_OFF, 0),
-                       lustre_msg_buflen(msg, PLAIN_PACK_MSG_OFF),
-                       NULL, 0, (unsigned char *)&msg->lm_cksum, &hsize);
+                                      lustre_msg_buf(msg, PLAIN_PACK_MSG_OFF,
+                                                     0),
+                                      lustre_msg_buflen(msg,
+                                                        PLAIN_PACK_MSG_OFF),
+                                      NULL, 0, (unsigned char *)&msg->lm_cksum,
+                                      &hsize);
                req->rq_reply_off = 0;
        }