dm-crypt: rename sector to cc_sector Rename sector to cc_sector. This is preparation for the following patch that merges dm_io and convert_context, both have "sector" field, so we have to rename one. Signed-off-by: Mikulas Patocka --- drivers/md/dm-crypt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Index: linux-3.2-fast/drivers/md/dm-crypt.c =================================================================== --- linux-3.2-fast.orig/drivers/md/dm-crypt.c 2012-02-18 17:11:33.000000000 +0100 +++ linux-3.2-fast/drivers/md/dm-crypt.c 2012-02-18 17:11:36.000000000 +0100 @@ -46,7 +46,7 @@ struct convert_context { unsigned int offset_out; unsigned int idx_in; unsigned int idx_out; - sector_t sector; + sector_t cc_sector; atomic_t cc_pending; }; @@ -646,7 +646,7 @@ static void crypt_convert_init(struct cr ctx->offset_out = 0; ctx->idx_in = bio_in ? bio_in->bi_idx : 0; ctx->idx_out = bio_out ? bio_out->bi_idx : 0; - ctx->sector = sector + cc->iv_offset; + ctx->cc_sector = sector + cc->iv_offset; } static struct dm_crypt_request *dmreq_of_req(struct crypt_config *cc, @@ -755,7 +755,7 @@ static int crypt_convert_block(struct cr dmreq = dmreq_of_req(cc, req); iv = iv_of_dmreq(cc, dmreq); - dmreq->iv_sector = ctx->sector; + dmreq->iv_sector = ctx->cc_sector; dmreq->ctx = ctx; sg_init_table(&dmreq->sg_in, 1); sg_set_page(&dmreq->sg_in, bv_in->bv_page, 1 << SECTOR_SHIFT, @@ -794,7 +794,7 @@ static int crypt_convert_block(struct cr static struct ablkcipher_request *crypt_alloc_req(struct crypt_config *cc, struct convert_context *ctx, gfp_t gfp_mask) { - unsigned key_index = ctx->sector & (cc->tfms_count - 1); + unsigned key_index = ctx->cc_sector & (cc->tfms_count - 1); struct ablkcipher_request *req = mempool_alloc(cc->req_pool, gfp_mask); if (!req) return NULL; @@ -862,7 +862,7 @@ static int crypt_convert(struct crypt_co goto ret; } - ctx->sector++; + ctx->cc_sector++; if (ctx->idx_in < ctx->bio_in->bi_vcnt && ctx->idx_out < ctx->bio_out->bi_vcnt) {