diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-02 23:16:01 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-02 23:16:01 -0500 |
| commit | 013daec9c19b73ef1e8e427dd7c8acca5766c17e (patch) | |
| tree | c14c687f40ec22c5f48e23a08e8ae00c2ddfc2f9 /drivers/md/persistent-data/dm-space-map-metadata.c | |
| parent | bf13c9a894162a91c8bb7d9555933e9fc3ff7d0e (diff) | |
| parent | 0414855fdc4a40da05221fc6062cccbc0c30f169 (diff) | |
Merge 3.14-rc5 into tty-next
We want these fixes in here
Diffstat (limited to 'drivers/md/persistent-data/dm-space-map-metadata.c')
| -rw-r--r-- | drivers/md/persistent-data/dm-space-map-metadata.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c index 536782e3bcb7..e9bdd462f4f5 100644 --- a/drivers/md/persistent-data/dm-space-map-metadata.c +++ b/drivers/md/persistent-data/dm-space-map-metadata.c | |||
| @@ -680,6 +680,8 @@ int dm_sm_metadata_create(struct dm_space_map *sm, | |||
| 680 | if (r) | 680 | if (r) |
| 681 | return r; | 681 | return r; |
| 682 | 682 | ||
| 683 | if (nr_blocks > DM_SM_METADATA_MAX_BLOCKS) | ||
| 684 | nr_blocks = DM_SM_METADATA_MAX_BLOCKS; | ||
| 683 | r = sm_ll_extend(&smm->ll, nr_blocks); | 685 | r = sm_ll_extend(&smm->ll, nr_blocks); |
| 684 | if (r) | 686 | if (r) |
| 685 | return r; | 687 | return r; |