diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2014-01-07 18:47:47 -0600 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2014-01-07 18:47:47 -0600 |
| commit | 00629ac158e1be3124b796078cf0347b946cb053 (patch) | |
| tree | bcd75715575579ba26f6b96cd66627fdba3bf02d /drivers/md/dm-thin.c | |
| parent | 2bf8ea63c7bb43b2b79ae3faa0797f1d83c6820c (diff) | |
| parent | 095f493c4d532b0ced3aee22e2d5b2cea02aa773 (diff) | |
Merge tag 'v3.10.25' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-lnglinux-lng-v3.10.25-finallinux-lng-3.10.25-2014.01
This is the 3.10.25 stable release
Conflicts:
kernel/futex.c
Diffstat (limited to 'drivers/md/dm-thin.c')
| -rw-r--r-- | drivers/md/dm-thin.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c index 88f2f802d528..e36f81e282eb 100644 --- a/drivers/md/dm-thin.c +++ b/drivers/md/dm-thin.c @@ -640,7 +640,9 @@ static void process_prepared_mapping(struct dm_thin_new_mapping *m) */ r = dm_thin_insert_block(tc->td, m->virt_block, m->data_block); if (r) { - DMERR_LIMIT("dm_thin_insert_block() failed"); + DMERR_LIMIT("%s: dm_thin_insert_block() failed: error = %d", + dm_device_name(pool->pool_md), r); + set_pool_mode(pool, PM_READ_ONLY); cell_error(pool, m->cell); goto out; } |