diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-08-26 16:02:38 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-08-26 16:02:38 -0400 |
| commit | fe3af705eed7127535d4aafaf0d34cbd43f53a90 (patch) | |
| tree | 406fb276ec5801b3c5f5b7f777043215b9dc9a81 /drivers/md/dm-cache-metadata.c | |
| parent | 4f1589607c38ffbb065a960d8915d9ebe1dae9a2 (diff) | |
| parent | d83a3234d2e1e2a55e7f2430fc9ca29a9bd315e7 (diff) | |
Merge tag 'v3.12.26' into v3.12-rt
This is the 3.12.26 stable release
Conflicts:
kernel/Kconfig.locks
kernel/trace/trace.c
Diffstat (limited to 'drivers/md/dm-cache-metadata.c')
| -rw-r--r-- | drivers/md/dm-cache-metadata.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/md/dm-cache-metadata.c b/drivers/md/dm-cache-metadata.c index 1d38019bb022..b564c0610259 100644 --- a/drivers/md/dm-cache-metadata.c +++ b/drivers/md/dm-cache-metadata.c @@ -407,6 +407,15 @@ static int __open_metadata(struct dm_cache_metadata *cmd) disk_super = dm_block_data(sblock); + /* Verify the data block size hasn't changed */ + if (le32_to_cpu(disk_super->data_block_size) != cmd->data_block_size) { + DMERR("changing the data block size (from %u to %llu) is not supported", + le32_to_cpu(disk_super->data_block_size), + (unsigned long long)cmd->data_block_size); + r = -EINVAL; + goto bad; + } + r = __check_incompat_features(disk_super, cmd); if (r < 0) goto bad; |