Merge git://git.infradead.org/~dwmw2/ideapad-2.6

[sfrench/cifs-2.6.git] / drivers / md / dm-exception-store.c

diff --git a/drivers/md/dm-exception-store.c b/drivers/md/dm-exception-store.c
index 2b7907b6dd094611c8cc9f31fbead6d7b553e1d7..0bdb201c2c2af04ceea2905db5f56c10fe1091df 100644 (file)
--- a/drivers/md/dm-exception-store.c
+++ b/drivers/md/dm-exception-store.c
@@ -173,7 +173,9 @@ int dm_exception_store_set_chunk_size(struct dm_exception_store *store,
 
        /* Validate the chunk size against the device block size */
        if (chunk_size %
-           (bdev_logical_block_size(dm_snap_cow(store->snap)->bdev) >> 9)) {
+           (bdev_logical_block_size(dm_snap_cow(store->snap)->bdev) >> 9) ||
+           chunk_size %
+           (bdev_logical_block_size(dm_snap_origin(store->snap)->bdev) >> 9)) {
                *error = "Chunk size is not a multiple of device blocksize";
                return -EINVAL;
        }