X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fsec_plain.c;h=ea9a46910f29da8108334d3cee2feece7f585cc9;hb=23a6e1ed8eec2c07653ed07c35bb109ecb87a5b7;hp=881add9bc0fe5f8f7d7f473ce191e8933a6f6287;hpb=816c9f01d5b44e05437b890aab4ef50edc02230f;p=fs%2Flustre-release.git diff --git a/lustre/ptlrpc/sec_plain.c b/lustre/ptlrpc/sec_plain.c index 881add9..ea9a469 100644 --- a/lustre/ptlrpc/sec_plain.c +++ b/lustre/ptlrpc/sec_plain.c @@ -156,13 +156,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_vec[i].kiov_len == 0) + if (desc->bd_vec[i].bv_len == 0) continue; - ptr = kmap(desc->bd_vec[i].kiov_page); - off = desc->bd_vec[i].kiov_offset & ~PAGE_MASK; + ptr = kmap(desc->bd_vec[i].bv_page); + off = desc->bd_vec[i].bv_offset & ~PAGE_MASK; ptr[off] ^= 0x1; - kunmap(desc->bd_vec[i].kiov_page); + kunmap(desc->bd_vec[i].bv_page); return; } } @@ -355,12 +355,12 @@ 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_vec[i].kiov_len + + if (desc->bd_vec[i].bv_len + nob > desc->bd_nob_transferred) { - desc->bd_vec[i].kiov_len = + desc->bd_vec[i].bv_len = desc->bd_nob_transferred - nob; } - nob += desc->bd_vec[i].kiov_len; + nob += desc->bd_vec[i].bv_len; } rc = plain_verify_bulk_csum(desc, req->rq_flvr.u_bulk.hash.hash_alg,