lustre: don't reinvent struct bio_vec

[cascardo/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 5c4590b..8322550 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;
        }
 }
@@ -349,11 +349,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,