diff options
author | Tejun Heo <tj@kernel.org> | 2010-11-13 05:55:18 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2010-11-13 05:55:18 -0500 |
commit | d4d77629953eabd3c14f6fa5746f6b28babfc55f (patch) | |
tree | 38cce0d4764ecb34a9f7f49332959780e28bb786 /drivers | |
parent | 75f1dc0d076d1c1168f2115f1941ea627d38bd5a (diff) |
block: clean up blkdev_get() wrappers and their users
After recent blkdev_get() modifications, open_by_devnum() and
open_bdev_exclusive() are simple wrappers around blkdev_get().
Replace them with blkdev_get_by_dev() and blkdev_get_by_path().
blkdev_get_by_dev() is identical to open_by_devnum().
blkdev_get_by_path() is slightly different in that it doesn't
automatically add %FMODE_EXCL to @mode.
All users are converted. Most conversions are mechanical and don't
introduce any behavior difference. There are several exceptions.
* btrfs now sets FMODE_EXCL in btrfs_device->mode, so there's no
reason to OR it explicitly on blkdev_put().
* gfs2, nilfs2 and the generic mount_bdev() now set FMODE_EXCL in
sb->s_mode.
* With the above changes, sb->s_mode now always should contain
FMODE_EXCL. WARN_ON_ONCE() added to kill_block_super() to detect
errors.
The new blkdev_get_*() functions are with proper docbook comments.
While at it, add function description to blkdev_get() too.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Philipp Reisner <philipp.reisner@linbit.com>
Cc: Neil Brown <neilb@suse.de>
Cc: Mike Snitzer <snitzer@redhat.com>
Cc: Joern Engel <joern@lazybastard.org>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Jan Kara <jack@suse.cz>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: KONISHI Ryusuke <konishi.ryusuke@lab.ntt.co.jp>
Cc: reiserfs-devel@vger.kernel.org
Cc: xfs-masters@oss.sgi.com
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/block/drbd/drbd_nl.c | 12 | ||||
-rw-r--r-- | drivers/md/dm-table.c | 2 | ||||
-rw-r--r-- | drivers/md/md.c | 4 | ||||
-rw-r--r-- | drivers/mtd/devices/block2mtd.c | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index fd0346090289..650e43ba4f7c 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c | |||
@@ -902,8 +902,8 @@ static int drbd_nl_disk_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp | |||
902 | } | 902 | } |
903 | } | 903 | } |
904 | 904 | ||
905 | bdev = open_bdev_exclusive(nbc->dc.backing_dev, | 905 | bdev = blkdev_get_by_path(nbc->dc.backing_dev, |
906 | FMODE_READ | FMODE_WRITE, mdev); | 906 | FMODE_READ | FMODE_WRITE | FMODE_EXCL, mdev); |
907 | if (IS_ERR(bdev)) { | 907 | if (IS_ERR(bdev)) { |
908 | dev_err(DEV, "open(\"%s\") failed with %ld\n", nbc->dc.backing_dev, | 908 | dev_err(DEV, "open(\"%s\") failed with %ld\n", nbc->dc.backing_dev, |
909 | PTR_ERR(bdev)); | 909 | PTR_ERR(bdev)); |
@@ -920,10 +920,10 @@ static int drbd_nl_disk_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp | |||
920 | * should check it for you already; but if you don't, or | 920 | * should check it for you already; but if you don't, or |
921 | * someone fooled it, we need to double check here) | 921 | * someone fooled it, we need to double check here) |
922 | */ | 922 | */ |
923 | bdev = open_bdev_exclusive(nbc->dc.meta_dev, | 923 | bdev = blkdev_get_by_path(nbc->dc.meta_dev, |
924 | FMODE_READ | FMODE_WRITE, | 924 | FMODE_READ | FMODE_WRITE | FMODE_EXCL, |
925 | (nbc->dc.meta_dev_idx < 0) ? | 925 | (nbc->dc.meta_dev_idx < 0) ? |
926 | (void *)mdev : (void *)drbd_m_holder); | 926 | (void *)mdev : (void *)drbd_m_holder); |
927 | if (IS_ERR(bdev)) { | 927 | if (IS_ERR(bdev)) { |
928 | dev_err(DEV, "open(\"%s\") failed with %ld\n", nbc->dc.meta_dev, | 928 | dev_err(DEV, "open(\"%s\") failed with %ld\n", nbc->dc.meta_dev, |
929 | PTR_ERR(bdev)); | 929 | PTR_ERR(bdev)); |
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c index 9e88ca0c55e9..67150c32986c 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c | |||
@@ -325,7 +325,7 @@ static int open_dev(struct dm_dev_internal *d, dev_t dev, | |||
325 | 325 | ||
326 | BUG_ON(d->dm_dev.bdev); | 326 | BUG_ON(d->dm_dev.bdev); |
327 | 327 | ||
328 | bdev = open_by_devnum(dev, d->dm_dev.mode | FMODE_EXCL, _claim_ptr); | 328 | bdev = blkdev_get_by_dev(dev, d->dm_dev.mode | FMODE_EXCL, _claim_ptr); |
329 | if (IS_ERR(bdev)) | 329 | if (IS_ERR(bdev)) |
330 | return PTR_ERR(bdev); | 330 | return PTR_ERR(bdev); |
331 | 331 | ||
diff --git a/drivers/md/md.c b/drivers/md/md.c index 6af951ffe0bb..5aaa6bfbe638 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
@@ -1934,8 +1934,8 @@ static int lock_rdev(mdk_rdev_t *rdev, dev_t dev, int shared) | |||
1934 | struct block_device *bdev; | 1934 | struct block_device *bdev; |
1935 | char b[BDEVNAME_SIZE]; | 1935 | char b[BDEVNAME_SIZE]; |
1936 | 1936 | ||
1937 | bdev = open_by_devnum(dev, FMODE_READ|FMODE_WRITE|FMODE_EXCL, | 1937 | bdev = blkdev_get_by_dev(dev, FMODE_READ|FMODE_WRITE|FMODE_EXCL, |
1938 | shared ? (mdk_rdev_t *)lock_rdev : rdev); | 1938 | shared ? (mdk_rdev_t *)lock_rdev : rdev); |
1939 | if (IS_ERR(bdev)) { | 1939 | if (IS_ERR(bdev)) { |
1940 | printk(KERN_ERR "md: could not open %s.\n", | 1940 | printk(KERN_ERR "md: could not open %s.\n", |
1941 | __bdevname(dev, b)); | 1941 | __bdevname(dev, b)); |
diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c index aa557beb8f51..f29a6f9df6e7 100644 --- a/drivers/mtd/devices/block2mtd.c +++ b/drivers/mtd/devices/block2mtd.c | |||
@@ -247,7 +247,7 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size) | |||
247 | return NULL; | 247 | return NULL; |
248 | 248 | ||
249 | /* Get a handle on the device */ | 249 | /* Get a handle on the device */ |
250 | bdev = open_bdev_exclusive(devname, mode, dev); | 250 | bdev = blkdev_get_by_path(devname, mode, dev); |
251 | #ifndef MODULE | 251 | #ifndef MODULE |
252 | if (IS_ERR(bdev)) { | 252 | if (IS_ERR(bdev)) { |
253 | 253 | ||
@@ -256,7 +256,7 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size) | |||
256 | 256 | ||
257 | dev_t devt = name_to_dev_t(devname); | 257 | dev_t devt = name_to_dev_t(devname); |
258 | if (devt) | 258 | if (devt) |
259 | bdev = open_by_devnum(devt, mode, dev); | 259 | bdev = blkdev_get_by_dev(devt, mode, dev); |
260 | } | 260 | } |
261 | #endif | 261 | #endif |
262 | 262 | ||