From 7c6664114b7342a36f14a6836564e865669b3cea Mon Sep 17 00:00:00 2001 From: Alasdair G Kergon Date: Thu, 10 Dec 2009 23:52:19 +0000 Subject: [RHEL5.7 PATCH] dm: rename dm_get_table to dm_get_live_table Upstream commit 7c6664114b7342a36f14a6836564e865669b3cea Author: Alasdair G Kergon Date: Thu Dec 10 23:52:19 2009 +0000 dm: rename dm_get_table to dm_get_live_table Rename dm_get_table to dm_get_live_table. Signed-off-by: Alasdair G Kergon --- drivers/md/dm-ioctl.c | 14 +++++++------- drivers/md/dm-table.c | 2 +- drivers/md/dm.c | 18 +++++++++--------- include/linux/device-mapper.h | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) Index: linux-rhel5/drivers/md/dm-ioctl.c =================================================================== --- linux-rhel5.orig/drivers/md/dm-ioctl.c +++ linux-rhel5/drivers/md/dm-ioctl.c @@ -235,7 +235,7 @@ static void __hash_remove(struct hash_ce dm_set_mdptr(hc->md, NULL); mutex_unlock(&dm_hash_cells_mutex); - table = dm_get_table(hc->md); + table = dm_get_live_table(hc->md); if (table) { dm_table_event(table); dm_table_put(table); @@ -338,7 +338,7 @@ static int dm_hash_rename(const char *ol /* * Wake up any dm event waiters. */ - table = dm_get_table(hc->md); + table = dm_get_live_table(hc->md); if (table) { dm_table_event(table); dm_table_put(table); @@ -562,7 +562,7 @@ static int __dev_status(struct mapped_de param->event_nr = dm_get_event_nr(md); - table = dm_get_table(md); + table = dm_get_live_table(md); if (table) { param->flags |= DM_ACTIVE_PRESENT_FLAG; param->target_count = dm_table_get_num_targets(table); @@ -987,7 +987,7 @@ static int dev_wait(struct dm_ioctl *par if (r) goto out; - table = dm_get_table(md); + table = dm_get_live_table(md); if (table) { retrieve_status(table, param, param_size); dm_table_put(table); @@ -1186,7 +1186,7 @@ static int table_deps(struct dm_ioctl *p if (r) goto out; - table = dm_get_table(md); + table = dm_get_live_table(md); if (table) { retrieve_deps(table, param, param_size); dm_table_put(table); @@ -1215,7 +1215,7 @@ static int table_status(struct dm_ioctl if (r) goto out; - table = dm_get_table(md); + table = dm_get_live_table(md); if (table) { retrieve_status(table, param, param_size); dm_table_put(table); @@ -1259,7 +1259,7 @@ static int target_message(struct dm_ioct goto out; } - table = dm_get_table(md); + table = dm_get_live_table(md); if (!table) goto out_argv; Index: linux-rhel5/drivers/md/dm.c =================================================================== --- linux-rhel5.orig/drivers/md/dm.c +++ linux-rhel5/drivers/md/dm.c @@ -323,7 +323,7 @@ static int dm_blk_ioctl(struct inode *in md = inode->i_bdev->bd_disk->private_data; - map = dm_get_table(md); + map = dm_get_live_table(md); if (!map || !dm_table_get_size(map)) goto out; @@ -422,7 +422,7 @@ static int queue_io(struct mapped_device * function to access the md->map field, and make sure they call * dm_table_put() when finished. */ -struct dm_table *dm_get_table(struct mapped_device *md) +struct dm_table *dm_get_live_table(struct mapped_device *md) { struct dm_table *t; @@ -807,7 +807,7 @@ static void __split_bio(struct mapped_de struct clone_info ci; int error = 0; - ci.map = dm_get_table(md); + ci.map = dm_get_live_table(md); if (!ci.map) { bio_io_error(bio, bio->bi_size); return; @@ -897,7 +897,7 @@ static int dm_flush_all(request_queue_t sector_t *error_sector) { struct mapped_device *md = q->queuedata; - struct dm_table *map = dm_get_table(md); + struct dm_table *map = dm_get_live_table(md); int ret = -ENXIO; if (map) { @@ -911,7 +911,7 @@ static int dm_flush_all(request_queue_t static void dm_unplug_all(request_queue_t *q) { struct mapped_device *md = q->queuedata; - struct dm_table *map = dm_get_table(md); + struct dm_table *map = dm_get_live_table(md); if (map) { dm_table_unplug_all(map); @@ -928,7 +928,7 @@ static int dm_any_congested(void *conges atomic_inc(&md->pending); if (!test_bit(DMF_BLOCK_IO, &md->flags)) { - map = dm_get_table(md); + map = dm_get_live_table(md); if (map) { r = dm_table_any_congested(map, bdi_bits); dm_table_put(map); @@ -1296,7 +1296,7 @@ void dm_put(struct mapped_device *md) BUG_ON(test_bit(DMF_FREEING, &md->flags)); if (atomic_dec_and_lock(&md->holders, &_minor_lock)) { - map = dm_get_table(md); + map = dm_get_live_table(md); idr_replace(&_minor_idr, MINOR_ALLOCED, dm_disk(md)->first_minor); set_bit(DMF_FREEING, &md->flags); spin_unlock(&_minor_lock); @@ -1409,7 +1409,7 @@ int dm_suspend(struct mapped_device *md, if (dm_suspended(md)) goto out_unlock; - map = dm_get_table(md); + map = dm_get_live_table(md); /* * DMF_NOFLUSH_SUSPENDING must be set before presuspend. @@ -1539,7 +1539,7 @@ int dm_resume(struct mapped_device *md) if (!dm_suspended(md)) goto out; - map = dm_get_table(md); + map = dm_get_live_table(md); if (!map || !dm_table_get_size(map)) goto out; Index: linux-rhel5/include/linux/device-mapper.h =================================================================== --- linux-rhel5.orig/include/linux/device-mapper.h +++ linux-rhel5/include/linux/device-mapper.h @@ -220,7 +220,7 @@ int dm_table_complete(struct dm_table *t /* * Table reference counting. */ -struct dm_table *dm_get_table(struct mapped_device *md); +struct dm_table *dm_get_live_table(struct mapped_device *md); void dm_table_get(struct dm_table *t); void dm_table_put(struct dm_table *t); Index: linux-rhel5/drivers/md/dm-table.c =================================================================== --- linux-rhel5.orig/drivers/md/dm-table.c +++ linux-rhel5/drivers/md/dm-table.c @@ -251,7 +251,7 @@ int dm_create_error_table(struct dm_tabl * Find current size of device. * Default to 1 sector if inactive. */ - t = dm_get_table(md); + t = dm_get_live_table(md); if (t) { dev_size = dm_table_get_size(t); dm_table_put(t);