bcache: Pull on disk data structures out into a separate header

[deliverable/linux.git] / drivers / md / bcache / request.c

diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c
index cf7850a7592c6940c948f07ffd6dcda53fb55b6e..932300f189730e0ed06b68ffa4c74464e433f55a 100644 (file)
--- a/drivers/md/bcache/request.c
+++ b/drivers/md/bcache/request.c
@@ -264,16 +264,17 @@ static void bch_data_invalidate(struct closure *cl)
                 bio_sectors(bio), (uint64_t) bio->bi_sector);
 
        while (bio_sectors(bio)) {
-               unsigned len = min(bio_sectors(bio), 1U << 14);
+               unsigned sectors = min(bio_sectors(bio),
+                                      1U << (KEY_SIZE_BITS - 1));
 
                if (bch_keylist_realloc(&op->insert_keys, 0, op->c))
                        goto out;
 
-               bio->bi_sector  += len;
-               bio->bi_size    -= len << 9;
+               bio->bi_sector  += sectors;
+               bio->bi_size    -= sectors << 9;
 
                bch_keylist_add(&op->insert_keys,
-                               &KEY(op->inode, bio->bi_sector, len));
+                               &KEY(op->inode, bio->bi_sector, sectors));
        }
 
        op->insert_data_done = true;