diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2013-12-13 13:24:44 (GMT) |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2014-01-07 15:11:54 (GMT) |
| commit | 10343180f5c4023043e82d46e71048e68f975f50 (patch) | |
| tree | 37827fe56938cf4148c2cd5b4a36d0ced5ccd99e | |
| parent | c46985e211fa6d6895104cc4858e85e53e8c7731 (diff) | |
| download | linux-10343180f5c4023043e82d46e71048e68f975f50.tar.xz | |
dm persistent data: cleanup dm-thin specific references in text
DM's persistent-data library is now used my multiple targets so
exclusive references to "pool" or "thin provisioning" need to be
cleaned up. Adjust Kconfig's DM_DEBUG_BLOCK_STACK_TRACING text
and remove "pool" from a block manager error message.
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Acked-by: Joe Thornber <ejt@redhat.com>
| -rw-r--r-- | drivers/md/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/md/persistent-data/dm-block-manager.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig index f2ccbc3..7441344 100644 --- a/drivers/md/Kconfig +++ b/drivers/md/Kconfig @@ -250,12 +250,12 @@ config DM_THIN_PROVISIONING Provides thin provisioning and snapshots that share a data store. config DM_DEBUG_BLOCK_STACK_TRACING - boolean "Keep stack trace of thin provisioning block lock holders" - depends on STACKTRACE_SUPPORT && DM_THIN_PROVISIONING + boolean "Keep stack trace of persistent data block lock holders" + depends on STACKTRACE_SUPPORT && DM_PERSISTENT_DATA select STACKTRACE ---help--- Enable this for messages that may help debug problems with the - block manager locking used by thin provisioning. + block manager locking used by thin provisioning and caching. If unsure, say N. diff --git a/drivers/md/persistent-data/dm-block-manager.c b/drivers/md/persistent-data/dm-block-manager.c index 064a3c2..455f792 100644 --- a/drivers/md/persistent-data/dm-block-manager.c +++ b/drivers/md/persistent-data/dm-block-manager.c @@ -104,7 +104,7 @@ static int __check_holder(struct block_lock *lock) for (i = 0; i < MAX_HOLDERS; i++) { if (lock->holders[i] == current) { - DMERR("recursive lock detected in pool metadata"); + DMERR("recursive lock detected in metadata"); #ifdef CONFIG_DM_DEBUG_BLOCK_STACK_TRACING DMERR("previously held here:"); print_stack_trace(lock->traces + i, 4); |