[PATCH 6/6] dm to use bd_claim_by_disk

From: Jun'ichi Nomura
Date: Fri Mar 03 2006 - 19:55:17 EST


This patch is part of dm/md sysfs dependency tree.

Following symlinks are created if dm-0 maps to sda:
/sys/block/dm-0/slaves/sda --> /sys/block/sda
/sys/block/sda/holders/dm-0 --> /sys/block/dm-0

This patch depends on dm-table-store-md.patch in
http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/

Thanks,
--
Jun'ichi Nomura, NEC Solutions (America), Inc.
Use bd_claim_by_disk.

Following symlinks are created if dm-0 maps to sda:
/sys/block/dm-0/slaves/sda --> /sys/block/sda
/sys/block/sda/holders/dm-0 --> /sys/block/dm-0

This patch depends on dm-table-store-md.patch in
http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/

Signed-off-by: Jun'ichi Nomura <j-nomura@xxxxxxxxxxxxx>

drivers/md/dm-table.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)

--- linux-2.6.16-rc5.orig/drivers/md/dm-table.c 2006-03-02 14:55:14.000000000 -0500
+++ linux-2.6.16-rc5/drivers/md/dm-table.c 2006-03-02 14:57:01.000000000 -0500
@@ -348,7 +348,7 @@ static struct dm_dev *find_device(struct
/*
* Open a device so we can use it as a map destination.
*/
-static int open_dev(struct dm_dev *d, dev_t dev)
+static int open_dev(struct dm_dev *d, dev_t dev, struct gendisk *holder)
{
static char *_claim_ptr = "I belong to device-mapper";
struct block_device *bdev;
@@ -361,7 +361,7 @@ static int open_dev(struct dm_dev *d, de
bdev = open_by_devnum(dev, d->mode);
if (IS_ERR(bdev))
return PTR_ERR(bdev);
- r = bd_claim(bdev, _claim_ptr);
+ r = bd_claim_by_disk(bdev, _claim_ptr, holder);
if (r)
blkdev_put(bdev);
else
@@ -372,12 +372,12 @@ static int open_dev(struct dm_dev *d, de
/*
* Close a device that we've been using.
*/
-static void close_dev(struct dm_dev *d)
+static void close_dev(struct dm_dev *d, struct gendisk *holder)
{
if (!d->bdev)
return;

- bd_release(d->bdev);
+ bd_release_from_disk(d->bdev, holder);
blkdev_put(d->bdev);
d->bdev = NULL;
}
@@ -398,7 +398,7 @@ static int check_device_area(struct dm_d
* careful to leave things as they were if we fail to reopen the
* device.
*/
-static int upgrade_mode(struct dm_dev *dd, int new_mode)
+static int upgrade_mode(struct dm_dev *dd, int new_mode, struct gendisk *holder)
{
int r;
struct dm_dev dd_copy;
@@ -408,9 +408,9 @@ static int upgrade_mode(struct dm_dev *d

dd->mode |= new_mode;
dd->bdev = NULL;
- r = open_dev(dd, dev);
+ r = open_dev(dd, dev, holder);
if (!r)
- close_dev(&dd_copy);
+ close_dev(&dd_copy, holder);
else
*dd = dd_copy;

@@ -453,7 +453,7 @@ static int __table_get_device(struct dm_
dd->mode = mode;
dd->bdev = NULL;

- if ((r = open_dev(dd, dev))) {
+ if ((r = open_dev(dd, dev, dm_disk(t->md)))) {
kfree(dd);
return r;
}
@@ -464,7 +464,7 @@ static int __table_get_device(struct dm_
list_add(&dd->list, &t->devices);

} else if (dd->mode != (mode | dd->mode)) {
- r = upgrade_mode(dd, mode);
+ r = upgrade_mode(dd, mode, dm_disk(t->md));
if (r)
return r;
}
@@ -539,7 +539,7 @@ int dm_get_device(struct dm_target *ti,
void dm_put_device(struct dm_target *ti, struct dm_dev *dd)
{
if (atomic_dec_and_test(&dd->count)) {
- close_dev(dd);
+ close_dev(dd, dm_disk(ti->table->md));
list_del(&dd->list);
kfree(dd);
}