diff options
author | Kiyoshi Ueda <k-ueda@ct.jp.nec.com> | 2009-12-10 18:52:26 -0500 |
---|---|---|
committer | Alasdair G Kergon <agk@redhat.com> | 2009-12-10 18:52:26 -0500 |
commit | 4f186f8bbfa92bf1a2b39f7a8674348bfdba9437 (patch) | |
tree | 9fd65776c0314abf6774f30e542d565e22ae4698 /drivers/md/dm.c | |
parent | 4d4471cb5c1ec426c0f24818b270dc7b3ad7e655 (diff) |
dm: rename dm_suspended to dm_suspended_md
This patch renames dm_suspended() to dm_suspended_md() and
keeps it internal to dm.
No functional change.
Signed-off-by: Kiyoshi Ueda <k-ueda@ct.jp.nec.com>
Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
Cc: Mike Anderson <andmike@linux.vnet.ibm.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Diffstat (limited to 'drivers/md/dm.c')
-rw-r--r-- | drivers/md/dm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c index f2b993c43359..e0702bf37935 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c | |||
@@ -415,7 +415,7 @@ static int dm_blk_ioctl(struct block_device *bdev, fmode_t mode, | |||
415 | 415 | ||
416 | tgt = dm_table_get_target(map, 0); | 416 | tgt = dm_table_get_target(map, 0); |
417 | 417 | ||
418 | if (dm_suspended(md)) { | 418 | if (dm_suspended_md(md)) { |
419 | r = -EAGAIN; | 419 | r = -EAGAIN; |
420 | goto out; | 420 | goto out; |
421 | } | 421 | } |
@@ -2182,7 +2182,7 @@ void dm_put(struct mapped_device *md) | |||
2182 | MINOR(disk_devt(dm_disk(md)))); | 2182 | MINOR(disk_devt(dm_disk(md)))); |
2183 | set_bit(DMF_FREEING, &md->flags); | 2183 | set_bit(DMF_FREEING, &md->flags); |
2184 | spin_unlock(&_minor_lock); | 2184 | spin_unlock(&_minor_lock); |
2185 | if (!dm_suspended(md)) { | 2185 | if (!dm_suspended_md(md)) { |
2186 | dm_table_presuspend_targets(map); | 2186 | dm_table_presuspend_targets(map); |
2187 | dm_table_postsuspend_targets(map); | 2187 | dm_table_postsuspend_targets(map); |
2188 | } | 2188 | } |
@@ -2381,7 +2381,7 @@ struct dm_table *dm_swap_table(struct mapped_device *md, struct dm_table *table) | |||
2381 | mutex_lock(&md->suspend_lock); | 2381 | mutex_lock(&md->suspend_lock); |
2382 | 2382 | ||
2383 | /* device must be suspended */ | 2383 | /* device must be suspended */ |
2384 | if (!dm_suspended(md)) | 2384 | if (!dm_suspended_md(md)) |
2385 | goto out; | 2385 | goto out; |
2386 | 2386 | ||
2387 | r = dm_calculate_queue_limits(table, &limits); | 2387 | r = dm_calculate_queue_limits(table, &limits); |
@@ -2461,7 +2461,7 @@ int dm_suspend(struct mapped_device *md, unsigned suspend_flags) | |||
2461 | 2461 | ||
2462 | mutex_lock(&md->suspend_lock); | 2462 | mutex_lock(&md->suspend_lock); |
2463 | 2463 | ||
2464 | if (dm_suspended(md)) { | 2464 | if (dm_suspended_md(md)) { |
2465 | r = -EINVAL; | 2465 | r = -EINVAL; |
2466 | goto out_unlock; | 2466 | goto out_unlock; |
2467 | } | 2467 | } |
@@ -2568,7 +2568,7 @@ int dm_resume(struct mapped_device *md) | |||
2568 | struct dm_table *map = NULL; | 2568 | struct dm_table *map = NULL; |
2569 | 2569 | ||
2570 | mutex_lock(&md->suspend_lock); | 2570 | mutex_lock(&md->suspend_lock); |
2571 | if (!dm_suspended(md)) | 2571 | if (!dm_suspended_md(md)) |
2572 | goto out; | 2572 | goto out; |
2573 | 2573 | ||
2574 | map = dm_get_live_table(md); | 2574 | map = dm_get_live_table(md); |
@@ -2679,7 +2679,7 @@ struct mapped_device *dm_get_from_kobject(struct kobject *kobj) | |||
2679 | return md; | 2679 | return md; |
2680 | } | 2680 | } |
2681 | 2681 | ||
2682 | int dm_suspended(struct mapped_device *md) | 2682 | int dm_suspended_md(struct mapped_device *md) |
2683 | { | 2683 | { |
2684 | return test_bit(DMF_SUSPENDED, &md->flags); | 2684 | return test_bit(DMF_SUSPENDED, &md->flags); |
2685 | } | 2685 | } |