Merge branch 'akpm' (Andrew's patch-bomb)

[karo-tx-linux.git] / drivers / md / dm-verity.c

diff --git a/drivers/md/dm-verity.c b/drivers/md/dm-verity.c
index 892ae2766aa6adad52b6d99030a1d8d3bcf2ac38..9e7328bb40301e83a402e79173f84f1022b14159 100644 (file)
--- a/drivers/md/dm-verity.c
+++ b/drivers/md/dm-verity.c
@@ -438,7 +438,7 @@ static void verity_prefetch_io(struct dm_verity *v, struct dm_verity_io *io)
                verity_hash_at_level(v, io->block, i, &hash_block_start, NULL);
                verity_hash_at_level(v, io->block + io->n_blocks - 1, i, &hash_block_end, NULL);
                if (!i) {
-                       unsigned cluster = *(volatile unsigned *)&dm_verity_prefetch_cluster;
+                       unsigned cluster = ACCESS_ONCE(dm_verity_prefetch_cluster);
 
                        cluster >>= v->data_dev_block_bits;
                        if (unlikely(!cluster))