diff options
author | Alasdair G Kergon <agk@redhat.com> | 2009-12-10 18:52:19 -0500 |
---|---|---|
committer | Alasdair G Kergon <agk@redhat.com> | 2009-12-10 18:52:19 -0500 |
commit | 7c6664114b7342a36f14a6836564e865669b3cea (patch) | |
tree | 0f00dcd89bec3ae1e4003b23018a2b1bf5464ff0 /drivers/md/dm-ioctl.c | |
parent | d0bcb8786532b01206f04258eb6b7d4ac858436a (diff) |
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 <agk@redhat.com>
Diffstat (limited to 'drivers/md/dm-ioctl.c')
-rw-r--r-- | drivers/md/dm-ioctl.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c index 99de0e4ce831..bf3d19a0fb78 100644 --- a/drivers/md/dm-ioctl.c +++ b/drivers/md/dm-ioctl.c | |||
@@ -235,7 +235,7 @@ static void __hash_remove(struct hash_cell *hc) | |||
235 | dm_set_mdptr(hc->md, NULL); | 235 | dm_set_mdptr(hc->md, NULL); |
236 | mutex_unlock(&dm_hash_cells_mutex); | 236 | mutex_unlock(&dm_hash_cells_mutex); |
237 | 237 | ||
238 | table = dm_get_table(hc->md); | 238 | table = dm_get_live_table(hc->md); |
239 | if (table) { | 239 | if (table) { |
240 | dm_table_event(table); | 240 | dm_table_event(table); |
241 | dm_table_put(table); | 241 | dm_table_put(table); |
@@ -338,7 +338,7 @@ static int dm_hash_rename(uint32_t cookie, const char *old, const char *new) | |||
338 | /* | 338 | /* |
339 | * Wake up any dm event waiters. | 339 | * Wake up any dm event waiters. |
340 | */ | 340 | */ |
341 | table = dm_get_table(hc->md); | 341 | table = dm_get_live_table(hc->md); |
342 | if (table) { | 342 | if (table) { |
343 | dm_table_event(table); | 343 | dm_table_event(table); |
344 | dm_table_put(table); | 344 | dm_table_put(table); |
@@ -564,7 +564,7 @@ static int __dev_status(struct mapped_device *md, struct dm_ioctl *param) | |||
564 | 564 | ||
565 | param->event_nr = dm_get_event_nr(md); | 565 | param->event_nr = dm_get_event_nr(md); |
566 | 566 | ||
567 | table = dm_get_table(md); | 567 | table = dm_get_live_table(md); |
568 | if (table) { | 568 | if (table) { |
569 | param->flags |= DM_ACTIVE_PRESENT_FLAG; | 569 | param->flags |= DM_ACTIVE_PRESENT_FLAG; |
570 | param->target_count = dm_table_get_num_targets(table); | 570 | param->target_count = dm_table_get_num_targets(table); |
@@ -993,7 +993,7 @@ static int dev_wait(struct dm_ioctl *param, size_t param_size) | |||
993 | if (r) | 993 | if (r) |
994 | goto out; | 994 | goto out; |
995 | 995 | ||
996 | table = dm_get_table(md); | 996 | table = dm_get_live_table(md); |
997 | if (table) { | 997 | if (table) { |
998 | retrieve_status(table, param, param_size); | 998 | retrieve_status(table, param, param_size); |
999 | dm_table_put(table); | 999 | dm_table_put(table); |
@@ -1226,7 +1226,7 @@ static int table_deps(struct dm_ioctl *param, size_t param_size) | |||
1226 | if (r) | 1226 | if (r) |
1227 | goto out; | 1227 | goto out; |
1228 | 1228 | ||
1229 | table = dm_get_table(md); | 1229 | table = dm_get_live_table(md); |
1230 | if (table) { | 1230 | if (table) { |
1231 | retrieve_deps(table, param, param_size); | 1231 | retrieve_deps(table, param, param_size); |
1232 | dm_table_put(table); | 1232 | dm_table_put(table); |
@@ -1255,7 +1255,7 @@ static int table_status(struct dm_ioctl *param, size_t param_size) | |||
1255 | if (r) | 1255 | if (r) |
1256 | goto out; | 1256 | goto out; |
1257 | 1257 | ||
1258 | table = dm_get_table(md); | 1258 | table = dm_get_live_table(md); |
1259 | if (table) { | 1259 | if (table) { |
1260 | retrieve_status(table, param, param_size); | 1260 | retrieve_status(table, param, param_size); |
1261 | dm_table_put(table); | 1261 | dm_table_put(table); |
@@ -1299,7 +1299,7 @@ static int target_message(struct dm_ioctl *param, size_t param_size) | |||
1299 | goto out; | 1299 | goto out; |
1300 | } | 1300 | } |
1301 | 1301 | ||
1302 | table = dm_get_table(md); | 1302 | table = dm_get_live_table(md); |
1303 | if (!table) | 1303 | if (!table) |
1304 | goto out_argv; | 1304 | goto out_argv; |
1305 | 1305 | ||