block: clean up bdev claim/release handling
Subsystems (22)
PATCH 1/1 block: clean up bdev claim/release handling
bdev exclusive access handling is somewhat clumsy. The primary interface is bd_claim() and bd_release() but there also are open_bdev_exclusive(), close_bdev_exclusive() and bd_claim_by_disk() and bd_release_from_disk().
Gaining exclusive access as a separate step from open itself also has the inherent problem that the block layer doesn't know whether the current open attempt is for an exclusive access or not. The action of open itself may affect the existing exclusive access but there's no way to prevent it.
This patchset simplifies the claim/release handling by folding it into blkdev_get/put() and making others simple wrappers around them. This simplifies code and removes strange corner cases like the non-atomicity of exclusive open described above.
There are five patches in this series.
0001-mtd-fix-bdev-exclusive-open-bugs-in-block2mtd-add_de.patch 0002-btrfs-close_bdev_exclusive-should-use-the-same-flags.patch 0003-block-simplify-holder-symlink-handling.patch 0004-block-make-blkdev_get-put-handle-exclusive-access.patch 0005-block-reorganize-claim-release-implementation.patch
0001-0002 are fixes regarding exclusive bdev opens. 0003 simplifies holder/slave symlink handling. 0004 folds bdev claim/release into blkdev_get/put(). 0005 reorganizes implementation a bit.
Cleaning up claim/release handling enables implementation of in-kernel disk event polling which be posted soon. Although this patchset touches various files including drivers and filesystems, the changes there are mostly trivial and I think it would be best to route these through the block tree.
This patchset is on top of 2.6.37-rc1 and available in the following git tree.
git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git cleanup-bd_claim
This patchset reduces about 400 lines of code.
Thanks.
block/ioctl.c | 5 drivers/block/drbd/drbd_int.h | 2 drivers/block/drbd/drbd_main.c | 7 drivers/block/drbd/drbd_nl.c | 103 ++----- drivers/block/pktcdvd.c | 22 - drivers/char/raw.c | 14 drivers/md/dm-table.c | 20 - drivers/md/md.c | 16 - drivers/mtd/devices/block2mtd.c | 10 drivers/s390/block/dasd_genhd.c | 2 fs/block_dev.c | 576 +++++++++------------------------------- fs/btrfs/volumes.c | 14 fs/ext3/super.c | 12 fs/ext4/super.c | 12 fs/gfs2/ops_fstype.c | 4 fs/jfs/jfs_logmgr.c | 17 - fs/logfs/dev_bdev.c | 4 fs/nilfs2/super.c | 4 fs/ocfs2/cluster/heartbeat.c | 2 fs/partitions/check.c | 2 fs/reiserfs/journal.c | 17 - fs/super.c | 14 fs/xfs/linux-2.6/xfs_super.c | 2 include/linux/fs.h | 22 - kernel/power/swap.c | 5 mm/swapfile.c | 7 26 files changed, 260 insertions(+), 655 deletions(-)
--
tejun
PATCH 1/5 mtd: fix bdev exclusive open bugs in block2mtd::add_device()
There are two bdev exclusive open bugs.
* open_bdev_exclusive() must not be called with NULL holder. Use dev as the holder.
* open_by_devnum() doesn't open the bdev exclusively but block2mtd_free_device() always assumes it. Explicitly claim the bdev.
The latter is rather clumsy but will be simplified with future blkdev_get/put() cleanups.
--- drivers/mtd/devices/block2mtd.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-)
drivers/mtd/devices/block2mtd.c +10 -1
@@ -246,7 +246,7 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)return NULL ;/* Get a handle on the device */ - bdev =open_bdev_exclusive (devname,FMODE_READ |FMODE_WRITE ,NULL ); + bdev =open_bdev_exclusive (devname,FMODE_READ |FMODE_WRITE , dev);#ifndef MODULE if (IS_ERR (bdev)) {
@@ -256,6 +256,15 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)dev_t devt =name_to_dev_t (devname);if (devt) { bdev =open_by_devnum (devt,FMODE_WRITE |FMODE_READ ); +if (!IS_ERR (bdev)) { +int ret; + ret =bd_claim (bdev, dev); +if (ret) { +blkdev_put (bdev, +FMODE_READ |FMODE_WRITE ); + bdev =ERR_PTR (ret); + } + } } }#endif
Signature · 1 line
1.7.1
PATCH 1/5 mtd: fix bdev exclusive open bugs in block2mtd::add_device()
In reply to Tejun HeoThere are two bdev exclusive open bugs.
* open_bdev_exclusive() must not be called with NULL holder. Use dev as the holder.
* open_by_devnum() doesn't open the bdev exclusively but block2mtd_free_device() always assumes it. Explicitly claim the bdev.
The latter is rather clumsy but will be simplified with future blkdev_get/put() cleanups.
--- drivers/mtd/devices/block2mtd.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-)
drivers/mtd/devices/block2mtd.c +10 -1
@@ -246,7 +246,7 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)return NULL ;/* Get a handle on the device */ - bdev =open_bdev_exclusive (devname,FMODE_READ |FMODE_WRITE ,NULL ); + bdev =open_bdev_exclusive (devname,FMODE_READ |FMODE_WRITE , dev);#ifndef MODULE if (IS_ERR (bdev)) {
@@ -256,6 +256,15 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)dev_t devt =name_to_dev_t (devname);if (devt) { bdev =open_by_devnum (devt,FMODE_WRITE |FMODE_READ ); +if (!IS_ERR (bdev)) { +int ret; + ret =bd_claim (bdev, dev); +if (ret) { +blkdev_put (bdev, +FMODE_READ |FMODE_WRITE ); + bdev =ERR_PTR (ret); + } + } } }#endif
Signature · 1 line
1.7.1
PATCH 1/5 mtd: fix bdev exclusive open bugs in block2mtd::add_device()
In reply to Tejun HeoThere are two bdev exclusive open bugs.
* open_bdev_exclusive() must not be called with NULL holder. Use dev as the holder.
* open_by_devnum() doesn't open the bdev exclusively but block2mtd_free_device() always assumes it. Explicitly claim the bdev.
The latter is rather clumsy but will be simplified with future blkdev_get/put() cleanups.
--- drivers/mtd/devices/block2mtd.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-)
drivers/mtd/devices/block2mtd.c +10 -1
@@ -246,7 +246,7 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)return NULL ;/* Get a handle on the device */ - bdev =open_bdev_exclusive (devname,FMODE_READ |FMODE_WRITE ,NULL ); + bdev =open_bdev_exclusive (devname,FMODE_READ |FMODE_WRITE , dev);#ifndef MODULE if (IS_ERR (bdev)) {
@@ -256,6 +256,15 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)dev_t devt =name_to_dev_t (devname);if (devt) { bdev =open_by_devnum (devt,FMODE_WRITE |FMODE_READ ); +if (!IS_ERR (bdev)) { +int ret; + ret =bd_claim (bdev, dev); +if (ret) { +blkdev_put (bdev, +FMODE_READ |FMODE_WRITE ); + bdev =ERR_PTR (ret); + } + } } }#endif
Signature · 1 line
1.7.1
Re: [PATCH 1/5] mtd: fix bdev exclusive open bugs in block2mtd::add_device()
Hi,
drivers/mtd/devices/block2mtd.c static struct block2mtd_dev *add_device(char *devname, int erase_size) · line 264
Quoted 6 lines · Tejun Heo
drivers/mtd/devices/block2mtd.c +6
-0+if (!IS_ERR (bdev)) { +int ret; + ret =bd_claim (bdev, dev); +if (ret) { +blkdev_put (bdev, +FMODE_READ |FMODE_WRITE );
Would be a bit cleaner to define ea temporary variable:
fmode_t mode = FMODE_READ | FMODE_WRITE;
Would you to re-send with this little change please?
And ideally, 2 independent patches would be nicer because you fix 2 independent issues.
Signature · 7 lines
Best Regards, Artem Bityutskiy (Артём Битюцкий) -- To unsubscribe from this list: send the line "unsubscribe reiserfs-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/5] mtd: fix bdev exclusive open bugs in block2mtd::add_device()
Hello,
Quoted 10 lines · Artem Bityutskiy
drivers/mtd/devices/block2mtd.c static struct block2mtd_dev *add_device(char *devname, int erase_size) · line 264
Quoted 6 lines · Tejun Heo
drivers/mtd/devices/block2mtd.c +6
-0+if (!IS_ERR (bdev)) { +int ret; + ret =bd_claim (bdev, dev); +if (ret) { +blkdev_put (bdev, +FMODE_READ |FMODE_WRITE );Would be a bit cleaner to define ea temporary variable:
Quoted 3 lines
fmode_tmode =FMODE_READ|FMODE_WRITE;Would you to re-send with this little change please?
Yeap, sure.
Quoted 2 lines
And ideally, 2 independent patches would be nicer because you fix 2 independent issues.
Hmmm... not really. The patch is small enough and splitting it won't really buy as any better bisectability. Splitting patches into logical changes is a good thing but it's no religious dogma. Let's apply it to the point it actually helps.
Thank you.
Signature · 1 line
tejun
Re: [PATCH 1/5] mtd: fix bdev exclusive open bugs in block2mtd::add_device()
Quoted 4 lines · Tejun Heo
Hmmm... not really. The patch is small enough and splitting it won't really buy as any better bisectability. Splitting patches into logical changes is a good thing but it's no religious dogma. Let's apply it to the point it actually helps.
Well, it is more about if your second fix is buggy, we could revert it without reverting the first fix. But anyway, this is not a big deal, so let's forget about this indeed.
Signature · 7 lines
Best Regards, Artem Bityutskiy (Артём Битюцкий) -- To unsubscribe from this list: send the line "unsubscribe reiserfs-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 1/5 mtd: fix bdev exclusive open bugs in block2mtd::add_device()
In reply to Tejun HeoThere are two bdev exclusive open bugs.
* open_bdev_exclusive() must not be called with NULL holder. Use dev as the holder.
* open_by_devnum() doesn't open the bdev exclusively but block2mtd_free_device() always assumes it. Explicitly claim the bdev.
The latter is rather clumsy but will be simplified with future blkdev_get/put() cleanups.
- Updated to use local variable @mode to cache FMODE_* masks as suggested by Artem Bityutskiy.
---
This change will cause two conflicts in the series. I'm not reposting them now as they're mostly trivial. Git tree is fully updated.
git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git cleanup-bd_claim
Jens, please let me know when/if you want the full series reposted.
Thanks.
drivers/mtd/devices/block2mtd.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/mtd/devices/block2mtd.c +11 -2
@@ -234,6 +234,7 @@ static void block2mtd_free_device(struct/* FIXME: ensure that mtd->size % erase_size == 0 */ static struct block2mtd_dev *add_device (char *devname,int erase_size) { +const fmode_t mode =FMODE_READ |FMODE_WRITE ;struct block_device *bdev;struct block2mtd_dev *dev;char *name;
@@ -246,7 +247,7 @@ static struct block2mtd_dev *add_device(return NULL ;/* Get a handle on the device */ - bdev =open_bdev_exclusive (devname,FMODE_READ |FMODE_WRITE ,NULL ); + bdev =open_bdev_exclusive (devname, mode, dev);#ifndef MODULE if (IS_ERR (bdev)) {
@@ -255,7 +256,15 @@ static struct block2mtd_dev *add_device(dev_t devt =name_to_dev_t (devname);if (devt) { - bdev =open_by_devnum (devt,FMODE_WRITE |FMODE_READ ); + bdev =open_by_devnum (devt, mode); +if (!IS_ERR (bdev)) { +int ret; + ret =bd_claim (bdev, dev); +if (ret) { +blkdev_put (bdev, mode); + bdev =ERR_PTR (ret); + } + } } }#endif
Re: [PATCH UPDATED 1/5] mtd: fix bdev exclusive open bugs in block2mtd::add_device()
Quoted 9 lines · Tejun Heo
There are two bdev exclusive open bugs.
*
open_bdev_exclusive()must not be called with NULL holder. Use dev as the holder.*
open_by_devnum()doesn't open the bdev exclusively butblock2mtd_free_device()always assumes it. Explicitly claim the bdev.
Quoted 5 lines
The latter is rather clumsy but will be simplified with future blkdev_get/put() cleanups.
- Updated to use local variable @mode to cache FMODE_* masks as suggested by Artem Bityutskiy.
Do you want this patch to go in via Jens' tree with the rest of the series, or as an independent patch via the mtd tree?
Anyway,
Thanks!
Signature · 7 lines
Best Regards, Artem Bityutskiy (Артём Битюцкий) -- To unsubscribe from this list: send the line "unsubscribe reiserfs-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH UPDATED 1/5] mtd: fix bdev exclusive open bugs in block2mtd::add_device()
Hello,
Quoted 10 lines · Artem Bityutskiy
Quoted 9 lines · Tejun Heo
There are two bdev exclusive open bugs.
*
open_bdev_exclusive()must not be called with NULL holder. Use dev as the holder.*
open_by_devnum()doesn't open the bdev exclusively butblock2mtd_free_device()always assumes it. Explicitly claim the bdev.
Quoted 8 lines
Quoted 5 lines
The latter is rather clumsy but will be simplified with future blkdev_get/put() cleanups.
- Updated to use local variable @mode to cache FMODE_* masks as suggested by Artem Bityutskiy.
Do you want this patch to go in via Jens' tree with the rest of the series, or as an independent patch via the mtd tree?
It probably would be easier if this is routed through Jens' tree as it's necessary for later patches in the series, but this being a fix, this should be merged during this cycle rather than the next one. Jens, how do you want to proceed?
Thank you.
Signature · 1 line
tejun
PATCH 2/5 btrfs: close_bdev_exclusive() should use the same @flags as the matching open_bdev_exclusive()
In reply to Tejun HeoIn the failure path of __btrfs_open_devices(), close_bdev_exclusive() is called with @flags which doesn't match the one used during open_bdev_exclusive(). Fix it.
--- fs/btrfs/volumes.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/btrfs/volumes.c +1 -1
@@ -638,7 +638,7 @@ static int __btrfs_open_devices(struct btrfs_fs_devices *fs_devices, error_brelse:brelse (bh); error_close: -close_bdev_exclusive (bdev,FMODE_READ ); +close_bdev_exclusive (bdev, flags); error:continue ; }
Signature · 1 line
1.7.1
PATCH 2/5 btrfs: close_bdev_exclusive() should use the same @flags as the matching open_bdev_exclusive()
In reply to Tejun HeoIn the failure path of __btrfs_open_devices(), close_bdev_exclusive() is called with @flags which doesn't match the one used during open_bdev_exclusive(). Fix it.
--- fs/btrfs/volumes.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/btrfs/volumes.c +1 -1
@@ -638,7 +638,7 @@ static int __btrfs_open_devices(struct btrfs_fs_devices *fs_devices, error_brelse:brelse (bh); error_close: -close_bdev_exclusive (bdev,FMODE_READ ); +close_bdev_exclusive (bdev, flags); error:continue ; }
Signature · 1 line
1.7.1
PATCH 2/5 btrfs: close_bdev_exclusive() should use the same @flags as the matching open_bdev_exclusive()
In reply to Tejun HeoIn the failure path of __btrfs_open_devices(), close_bdev_exclusive() is called with @flags which doesn't match the one used during open_bdev_exclusive(). Fix it.
--- fs/btrfs/volumes.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/btrfs/volumes.c +1 -1
@@ -638,7 +638,7 @@ static int __btrfs_open_devices(struct btrfs_fs_devices *fs_devices, error_brelse:brelse (bh); error_close: -close_bdev_exclusive (bdev,FMODE_READ ); +close_bdev_exclusive (bdev, flags); error:continue ; }
Signature · 1 line
1.7.1
PATCH 3/5 block: simplify holder symlink handling
In reply to Tejun HeoCode to manage symlinks in /sys/block/*/{holders|slaves} are overly complex with multiple holder considerations, redundant extra references to all involved kobjects, unused generic kobject holder support and unnecessary mixup with bd_claim/release functionalities.
Strip it down to what's necessary (single gendisk holder) and make it use a separate interface. This is a step for cleaning up bd_claim/release. This patch makes dm-table slightly more complex but it will be simplified again with further changes.
--- drivers/md/dm-table.c | 23 +++- drivers/md/md.c | 4 +- fs/block_dev.c | 322 +++++++------------------------------------------ include/linux/fs.h | 16 ++- 4 files changed, 74 insertions(+), 291 deletions(-)
drivers/md/dm-table.c +17 -6
@@ -328,12 +328,22 @@ static int open_dev(struct dm_dev_internal *d, dev_t dev, bdev =open_by_devnum (dev, d->dm_dev.mode);if (IS_ERR (bdev))return PTR_ERR (bdev); - r =bd_claim_by_disk (bdev, _claim_ptr,dm_disk (md)); -if (r) + + r =bd_claim (bdev, _claim_ptr); +if (r) {blkdev_put (bdev, d->dm_dev.mode); -else - d->dm_dev.bdev = bdev; -return r; +return r; + } + + r =bd_link_disk_holder (bdev,dm_disk (md)); +if (r) { +bd_release (bdev); +blkdev_put (bdev, d->dm_dev.mode); +return r; + } + + d->dm_dev.bdev = bdev; +return 0 ; }/*
@@ -344,7 +354,8 @@ static void close_dev(struct dm_dev_internal *d, struct mapped_device *md)if (!d->dm_dev.bdev)return ; -bd_release_from_disk (d->dm_dev.bdev,dm_disk (md)); +bd_unlink_disk_holder (d->dm_dev.bdev); +bd_release (d->dm_dev.bdev);blkdev_put (d->dm_dev.bdev, d->dm_dev.mode); d->dm_dev.bdev =NULL ; }
drivers/md/md.c +2 -2
@@ -1880,7 +1880,7 @@ static int bind_rdev_to_array(mdk_rdev_t * rdev, mddev_t * mddev) rdev->sysfs_state =sysfs_get_dirent_safe (rdev->kobj.sd,"state" );list_add_rcu (&rdev->same_set, &mddev->disks); -bd_claim_by_disk (rdev->bdev, rdev->bdev->bd_holder, mddev->gendisk); +bd_link_disk_holder (rdev->bdev, mddev->gendisk);/* May as well allow recovery to be retried once */ mddev->recovery_disabled =0 ;
@@ -1907,7 +1907,7 @@ static void unbind_rdev_from_array(mdk_rdev_t * rdev)MD_BUG ();return ; } -bd_release_from_disk (rdev->bdev, rdev->mddev->gendisk); +bd_unlink_disk_holder (rdev->bdev);list_del_rcu (&rdev->same_set);printk (KERN_INFO "md: unbind<%s>\n" ,bdevname (rdev->bdev,b)); rdev->mddev =NULL ;
fs/block_dev.c +44 -278
367 lines not on this page · raw message
include/linux/fs.h +11 -5
@@ -663,7 +663,7 @@ struct block_device {void * bd_holder;int bd_holders;#ifdef CONFIG_SYSFS -struct list_head bd_holder_list; +struct gendisk * bd_holder_disk;/* for sysfs slave linkng */ #endif struct block_device * bd_contains;unsigned bd_block_size;
@@ -2043,11 +2043,17 @@ extern int blkdev_put(struct block_device *, fmode_t);extern int bd_claim (struct block_device *,void *);extern void bd_release (struct block_device *);#ifdef CONFIG_SYSFS -extern int bd_claim_by_disk (struct block_device *,void *,struct gendisk *); -extern void bd_release_from_disk (struct block_device *,struct gendisk *); +extern int bd_link_disk_holder (struct block_device *bdev,struct gendisk *disk); +extern void bd_unlink_disk_holder (struct block_device *bdev);#else -#define bd_claim_by_disk (bdev, holder, disk) bd_claim(bdev, holder) -#define bd_release_from_disk (bdev, disk) bd_release(bdev) +static inline int bd_link_disk_holder (struct block_device *bdev, +struct gendisk *disk) +{ +return 0 ; +} +static inline void bd_unlink_disk_holder (struct block_device *bdev) +{ +}#endif #endif
Signature · 1 line
1.7.1
PATCH 3/5 block: simplify holder symlink handling
In reply to Tejun HeoCode to manage symlinks in /sys/block/*/{holders|slaves} are overly complex with multiple holder considerations, redundant extra references to all involved kobjects, unused generic kobject holder support and unnecessary mixup with bd_claim/release functionalities.
Strip it down to what's necessary (single gendisk holder) and make it use a separate interface. This is a step for cleaning up bd_claim/release. This patch makes dm-table slightly more complex but it will be simplified again with further changes.
--- drivers/md/dm-table.c | 23 +++- drivers/md/md.c | 4 +- fs/block_dev.c | 322 +++++++------------------------------------------ include/linux/fs.h | 16 ++- 4 files changed, 74 insertions(+), 291 deletions(-)
drivers/md/dm-table.c +17 -6
@@ -328,12 +328,22 @@ static int open_dev(struct dm_dev_internal *d, dev_t dev, bdev =open_by_devnum (dev, d->dm_dev.mode);if (IS_ERR (bdev))return PTR_ERR (bdev); - r =bd_claim_by_disk (bdev, _claim_ptr,dm_disk (md)); -if (r) + + r =bd_claim (bdev, _claim_ptr); +if (r) {blkdev_put (bdev, d->dm_dev.mode); -else - d->dm_dev.bdev = bdev; -return r; +return r; + } + + r =bd_link_disk_holder (bdev,dm_disk (md)); +if (r) { +bd_release (bdev); +blkdev_put (bdev, d->dm_dev.mode); +return r; + } + + d->dm_dev.bdev = bdev; +return 0 ; }/*
@@ -344,7 +354,8 @@ static void close_dev(struct dm_dev_internal *d, struct mapped_device *md)if (!d->dm_dev.bdev)return ; -bd_release_from_disk (d->dm_dev.bdev,dm_disk (md)); +bd_unlink_disk_holder (d->dm_dev.bdev); +bd_release (d->dm_dev.bdev);blkdev_put (d->dm_dev.bdev, d->dm_dev.mode); d->dm_dev.bdev =NULL ; }
drivers/md/md.c +2 -2
@@ -1880,7 +1880,7 @@ static int bind_rdev_to_array(mdk_rdev_t * rdev, mddev_t * mddev) rdev->sysfs_state =sysfs_get_dirent_safe (rdev->kobj.sd,"state" );list_add_rcu (&rdev->same_set, &mddev->disks); -bd_claim_by_disk (rdev->bdev, rdev->bdev->bd_holder, mddev->gendisk); +bd_link_disk_holder (rdev->bdev, mddev->gendisk);/* May as well allow recovery to be retried once */ mddev->recovery_disabled =0 ;
@@ -1907,7 +1907,7 @@ static void unbind_rdev_from_array(mdk_rdev_t * rdev)MD_BUG ();return ; } -bd_release_from_disk (rdev->bdev, rdev->mddev->gendisk); +bd_unlink_disk_holder (rdev->bdev);list_del_rcu (&rdev->same_set);printk (KERN_INFO "md: unbind<%s>\n" ,bdevname (rdev->bdev,b)); rdev->mddev =NULL ;
fs/block_dev.c +44 -278
367 lines not on this page · raw message
include/linux/fs.h +11 -5
@@ -663,7 +663,7 @@ struct block_device {void * bd_holder;int bd_holders;#ifdef CONFIG_SYSFS -struct list_head bd_holder_list; +struct gendisk * bd_holder_disk;/* for sysfs slave linkng */ #endif struct block_device * bd_contains;unsigned bd_block_size;
@@ -2043,11 +2043,17 @@ extern int blkdev_put(struct block_device *, fmode_t);extern int bd_claim (struct block_device *,void *);extern void bd_release (struct block_device *);#ifdef CONFIG_SYSFS -extern int bd_claim_by_disk (struct block_device *,void *,struct gendisk *); -extern void bd_release_from_disk (struct block_device *,struct gendisk *); +extern int bd_link_disk_holder (struct block_device *bdev,struct gendisk *disk); +extern void bd_unlink_disk_holder (struct block_device *bdev);#else -#define bd_claim_by_disk (bdev, holder, disk) bd_claim(bdev, holder) -#define bd_release_from_disk (bdev, disk) bd_release(bdev) +static inline int bd_link_disk_holder (struct block_device *bdev, +struct gendisk *disk) +{ +return 0 ; +} +static inline void bd_unlink_disk_holder (struct block_device *bdev) +{ +}#endif #endif
Signature · 1 line
1.7.1
PATCH 3/5 block: simplify holder symlink handling
In reply to Tejun HeoCode to manage symlinks in /sys/block/*/{holders|slaves} are overly complex with multiple holder considerations, redundant extra references to all involved kobjects, unused generic kobject holder support and unnecessary mixup with bd_claim/release functionalities.
Strip it down to what's necessary (single gendisk holder) and make it use a separate interface. This is a step for cleaning up bd_claim/release. This patch makes dm-table slightly more complex but it will be simplified again with further changes.
--- drivers/md/dm-table.c | 23 +++- drivers/md/md.c | 4 +- fs/block_dev.c | 322 +++++++------------------------------------------ include/linux/fs.h | 16 ++- 4 files changed, 74 insertions(+), 291 deletions(-)
drivers/md/dm-table.c +17 -6
@@ -328,12 +328,22 @@ static int open_dev(struct dm_dev_internal *d, dev_t dev, bdev =open_by_devnum (dev, d->dm_dev.mode);if (IS_ERR (bdev))return PTR_ERR (bdev); - r =bd_claim_by_disk (bdev, _claim_ptr,dm_disk (md)); -if (r) + + r =bd_claim (bdev, _claim_ptr); +if (r) {blkdev_put (bdev, d->dm_dev.mode); -else - d->dm_dev.bdev = bdev; -return r; +return r; + } + + r =bd_link_disk_holder (bdev,dm_disk (md)); +if (r) { +bd_release (bdev); +blkdev_put (bdev, d->dm_dev.mode); +return r; + } + + d->dm_dev.bdev = bdev; +return 0 ; }/*
@@ -344,7 +354,8 @@ static void close_dev(struct dm_dev_internal *d, struct mapped_device *md)if (!d->dm_dev.bdev)return ; -bd_release_from_disk (d->dm_dev.bdev,dm_disk (md)); +bd_unlink_disk_holder (d->dm_dev.bdev); +bd_release (d->dm_dev.bdev);blkdev_put (d->dm_dev.bdev, d->dm_dev.mode); d->dm_dev.bdev =NULL ; }
drivers/md/md.c +2 -2
@@ -1880,7 +1880,7 @@ static int bind_rdev_to_array(mdk_rdev_t * rdev, mddev_t * mddev) rdev->sysfs_state =sysfs_get_dirent_safe (rdev->kobj.sd,"state" );list_add_rcu (&rdev->same_set, &mddev->disks); -bd_claim_by_disk (rdev->bdev, rdev->bdev->bd_holder, mddev->gendisk); +bd_link_disk_holder (rdev->bdev, mddev->gendisk);/* May as well allow recovery to be retried once */ mddev->recovery_disabled =0 ;
@@ -1907,7 +1907,7 @@ static void unbind_rdev_from_array(mdk_rdev_t * rdev)MD_BUG ();return ; } -bd_release_from_disk (rdev->bdev, rdev->mddev->gendisk); +bd_unlink_disk_holder (rdev->bdev);list_del_rcu (&rdev->same_set);printk (KERN_INFO "md: unbind<%s>\n" ,bdevname (rdev->bdev,b)); rdev->mddev =NULL ;
fs/block_dev.c +44 -278
367 lines not on this page · raw message
include/linux/fs.h +11 -5
@@ -663,7 +663,7 @@ struct block_device {void * bd_holder;int bd_holders;#ifdef CONFIG_SYSFS -struct list_head bd_holder_list; +struct gendisk * bd_holder_disk;/* for sysfs slave linkng */ #endif struct block_device * bd_contains;unsigned bd_block_size;
@@ -2043,11 +2043,17 @@ extern int blkdev_put(struct block_device *, fmode_t);extern int bd_claim (struct block_device *,void *);extern void bd_release (struct block_device *);#ifdef CONFIG_SYSFS -extern int bd_claim_by_disk (struct block_device *,void *,struct gendisk *); -extern void bd_release_from_disk (struct block_device *,struct gendisk *); +extern int bd_link_disk_holder (struct block_device *bdev,struct gendisk *disk); +extern void bd_unlink_disk_holder (struct block_device *bdev);#else -#define bd_claim_by_disk (bdev, holder, disk) bd_claim(bdev, holder) -#define bd_release_from_disk (bdev, disk) bd_release(bdev) +static inline int bd_link_disk_holder (struct block_device *bdev, +struct gendisk *disk) +{ +return 0 ; +} +static inline void bd_unlink_disk_holder (struct block_device *bdev) +{ +}#endif #endif
Signature · 1 line
1.7.1
Re: [PATCH 3/5] block: simplify holder symlink handling
Quoted 5 lines · Tejun Heo
Code to manage symlinks in /sys/block/*/{holders|slaves} are overly complex with multiple holder considerations, redundant extra references to all involved kobjects, unused generic kobject holder support and unnecessary mixup with bd_claim/release functionalities.
Quoted 8 lines
Strip it down to what's necessary (single gendisk holder) and make it use a separate interface. This is a step for cleaning up bd_claim/release. This patch makes dm-table slightly more complex but it will be simplified again with further changes.
Quoted 49 lines
--- drivers/md/dm-table.c | 23 +++- drivers/md/md.c | 4 +- fs/block_dev.c | 322 +++++++------------------------------------------ include/linux/fs.h | 16 ++- 4 files changed, 74 insertions(+), 291 deletions(-)drivers/md/dm-table.c +17
-6@@ -328,12 +328,22 @@ static int open_dev(struct dm_dev_internal *d, dev_t dev, bdev =open_by_devnum (dev, d->dm_dev.mode);if (IS_ERR (bdev))return PTR_ERR (bdev); - r =bd_claim_by_disk (bdev, _claim_ptr,dm_disk (md)); -if (r) + + r =bd_claim (bdev, _claim_ptr); +if (r) {blkdev_put (bdev, d->dm_dev.mode); -else - d->dm_dev.bdev = bdev; -return r; +return r; + } + + r =bd_link_disk_holder (bdev,dm_disk (md)); +if (r) { +bd_release (bdev); +blkdev_put (bdev, d->dm_dev.mode); +return r; + } + + d->dm_dev.bdev = bdev; +return 0 ; }/* @@ -344,7 +354,8 @@ static void close_dev(struct dm_dev_internal *d, struct mapped_device *md)if (!d->dm_dev.bdev)return ; -bd_release_from_disk (d->dm_dev.bdev,dm_disk (md)); +bd_unlink_disk_holder (d->dm_dev.bdev); +bd_release (d->dm_dev.bdev);blkdev_put (d->dm_dev.bdev, d->dm_dev.mode); d->dm_dev.bdev =NULL ; }
PATCH 4/5 block: make blkdev_get/put() handle exclusive access
In reply to Tejun HeoOver time, block layer has accumulated a set of APIs dealing with bdev open, close, claim and release.
* blkdev_get/put() are the primary open and close functions.
* bd_claim/release() deal with exclusive open.
* open/close_bdev_exclusive() are combination of open and claim and the other way around, respectively.
* bd_link/unlink_disk_holder() to create and remove holder/slave symlinks.
* open_by_devnum() wraps bdget() + blkdev_get().
The interface is a bit confusing and the decoupling of open and claim makes it impossible to properly guarantee exclusive access as in-kernel open + claim sequence can disturb the existing exclusive open even before the block layer knows the current open if for another exclusive access. Reorganize the interface such that,
* blkdev_get() is extended to include exclusive access management. @holder argument is added and, if is @FMODE_EXCL specified, it will gain exclusive access atomically w.r.t. other exclusive accesses.
* blkdev_put() is similarly extended. It now takes @mode argument and if @FMODE_EXCL is set, it releases an exclusive access. Also, when the last exclusive claim is released, the holder/slave symlinks are removed automatically.
* bd_claim/release() and close_bdev_exclusive() are no longer necessary and either made static or removed.
* bd_link_disk_holder() remains the same but bd_unlink_disk_holder() is no longer necessary and removed.
* open_bdev_exclusive() becomes a simple wrapper around lookup_bdev() and blkdev_get(). It also has an unexpected extra bdev_read_only() test which probably should be moved into blkdev_get().
* open_by_devnum() is modified to take @holder argument and pass it to blkdev_get().
Most of bdev open/close operations are unified into blkdev_get/put() and most exclusive accesses are tested atomically at the open time (as it should). This cleans up code and removes some, both valid and invalid, but unnecessary all the same, corner cases.
open_bdev_exclusive() and open_by_devnum() can use further cleanup - rename to blkdev_get_by_path() and blkdev_get_by_devt() and drop special features. Well, let's leave them for another day.
Most conversions are straight-forward. drbd conversion is a bit more involved as there was some reordering, but the logic should stay the same.
--- block/ioctl.c | 5 +- drivers/block/drbd/drbd_int.h | 2 - drivers/block/drbd/drbd_main.c | 7 +-- drivers/block/drbd/drbd_nl.c | 105 ++++++++++------------------ drivers/block/pktcdvd.c | 22 ++---- drivers/char/raw.c | 14 +--- drivers/md/dm-table.c | 15 +--- drivers/md/md.c | 14 +--- drivers/mtd/devices/block2mtd.c | 17 +---- drivers/s390/block/dasd_genhd.c | 2 +- fs/block_dev.c | 149 +++++++++++++-------------------------- fs/btrfs/volumes.c | 14 ++-- fs/ext3/super.c | 12 +--- fs/ext4/super.c | 12 +--- fs/gfs2/ops_fstype.c | 4 +- fs/jfs/jfs_logmgr.c | 17 ++--- fs/logfs/dev_bdev.c | 4 +- fs/nilfs2/super.c | 4 +- fs/ocfs2/cluster/heartbeat.c | 2 +- fs/partitions/check.c | 2 +- fs/reiserfs/journal.c | 17 ++--- fs/super.c | 14 ++-- fs/xfs/linux-2.6/xfs_super.c | 2 +- include/linux/fs.h | 14 +--- kernel/power/swap.c | 5 +- mm/swapfile.c | 7 +- 26 files changed, 163 insertions(+), 319 deletions(-)
block/ioctl.c +3 -2
@@ -294,11 +294,12 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,return -EINVAL ;if (get_user (n, (int __user *) arg))return -EFAULT ; -if (!(mode &FMODE_EXCL ) &&bd_claim (bdev, &bdev) <0 ) +if (!(mode &FMODE_EXCL ) && +blkdev_get (bdev, mode |FMODE_EXCL , &bdev) <0 )return -EBUSY ; ret =set_blocksize (bdev, n);if (!(mode &FMODE_EXCL )) -bd_release (bdev); +blkdev_put (bdev, mode |FMODE_EXCL );return ret;case BLKPG : ret =blkpg_ioctl (bdev, (struct blkpg_ioctl_arg __user *) arg);
drivers/block/drbd/drbd_int.h +0 -2
@@ -923,8 +923,6 @@ struct drbd_md {struct drbd_backing_dev {struct block_device *backing_bdev;struct block_device *md_bdev; -struct file *lo_file; -struct file *md_file;struct drbd_md md;struct disk_conf dc;/* The user provided config... */ sector_t known_size;/* last known size of that backing device */
drivers/block/drbd/drbd_main.c +2 -5
@@ -3361,11 +3361,8 @@ void drbd_free_bc(struct drbd_backing_dev *ldev)if (ldev ==NULL )return ; -bd_release (ldev->backing_bdev); -bd_release (ldev->md_bdev); - -fput (ldev->lo_file); -fput (ldev->md_file); +blkdev_put (ldev->backing_bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); +blkdev_put (ldev->md_bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL );kfree (ldev); }
drivers/block/drbd/drbd_nl.c +36 -67
163 lines not on this page · raw message
drivers/block/pktcdvd.c +8 -14
@@ -2296,15 +2296,12 @@ static int pkt_open_dev(struct pktcdvd_device *pd, fmode_t write)* so bdget() can't fail. */ bdget (pd->bdev->bd_dev); -if ((ret =blkdev_get (pd->bdev,FMODE_READ ))) +if ((ret =blkdev_get (pd->bdev,FMODE_READ |FMODE_EXCL , pd))) goto out; -if ((ret =bd_claim (pd->bdev, pd))) - goto out_putdev; -if ((ret =pkt_get_last_written (pd, &lba))) {printk (DRIVER_NAME ": pkt_get_last_written failed\n" ); - goto out_unclaim; + goto out_putdev; }set_capacity (pd->disk, lba <<2 );
@@ -2314,7 +2311,7 @@ static int pkt_open_dev(struct pktcdvd_device *pd, fmode_t write) q =bdev_get_queue (pd->bdev);if (write) {if ((ret =pkt_open_write (pd))) - goto out_unclaim; + goto out_putdev;/* * Some CDRW drives can not handle writes larger than one packet, * even if the size is a multiple of the packet size.
@@ -2329,23 +2326,21 @@ static int pkt_open_dev(struct pktcdvd_device *pd, fmode_t write) }if ((ret =pkt_set_segment_merging (pd, q))) - goto out_unclaim; + goto out_putdev;if (write) {if (!pkt_grow_pktlist (pd,CONFIG_CDROM_PKTCDVD_BUFFERS )) {printk (DRIVER_NAME ": not enough memory for buffers\n" ); ret = -ENOMEM ; - goto out_unclaim; + goto out_putdev; }printk (DRIVER_NAME ": %lukB available on disc\n" , lba <<1 ); }return 0 ; -out_unclaim: -bd_release (pd->bdev); out_putdev: -blkdev_put (pd->bdev,FMODE_READ ); +blkdev_put (pd->bdev,FMODE_READ |FMODE_EXCL ); out:return ret; }
@@ -2362,8 +2357,7 @@ static void pkt_release_dev(struct pktcdvd_device *pd, int flush)pkt_lock_door (pd,0 );pkt_set_speed (pd,MAX_SPEED ,MAX_SPEED ); -bd_release (pd->bdev); -blkdev_put (pd->bdev,FMODE_READ ); +blkdev_put (pd->bdev,FMODE_READ |FMODE_EXCL );pkt_shrink_pktlist (pd); }
@@ -2733,7 +2727,7 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev) bdev =bdget (dev);if (!bdev)return -ENOMEM ; - ret =blkdev_get (bdev,FMODE_READ |FMODE_NDELAY ); + ret =blkdev_get (bdev,FMODE_READ |FMODE_NDELAY ,NULL );if (ret)return ret;
drivers/char/raw.c +4 -10
@@ -65,15 +65,12 @@ static int raw_open(struct inode *inode, struct file *filp)if (!bdev) goto out;igrab (bdev->bd_inode); - err =blkdev_get (bdev, filp->f_mode); + err =blkdev_get (bdev, filp->f_mode |FMODE_EXCL , raw_open);if (err) goto out; - err =bd_claim (bdev, raw_open); -if (err) - goto out1; err =set_blocksize (bdev,bdev_logical_block_size (bdev));if (err) - goto out2; + goto out1; filp->f_flags |=O_DIRECT ; filp->f_mapping = bdev->bd_inode->i_mapping;if (++raw_devices[minor].inuse ==1 )
@@ -83,10 +80,8 @@ static int raw_open(struct inode *inode, struct file *filp)mutex_unlock (&raw_mutex);return 0 ; -out2: -bd_release (bdev); out1: -blkdev_put (bdev, filp->f_mode); +blkdev_put (bdev, filp->f_mode |FMODE_EXCL ); out:mutex_unlock (&raw_mutex);return err;
@@ -110,8 +105,7 @@ static int raw_release(struct inode *inode, struct file *filp) }mutex_unlock (&raw_mutex); -bd_release (bdev); -blkdev_put (bdev, filp->f_mode); +blkdev_put (bdev, filp->f_mode |FMODE_EXCL );return 0 ; }
drivers/md/dm-table.c +3 -12
@@ -325,20 +325,13 @@ static int open_dev(struct dm_dev_internal *d, dev_t dev,BUG_ON (d->dm_dev.bdev); - bdev =open_by_devnum (dev, d->dm_dev.mode); + bdev =open_by_devnum (dev, d->dm_dev.mode |FMODE_EXCL , _claim_ptr);if (IS_ERR (bdev))return PTR_ERR (bdev); - r =bd_claim (bdev, _claim_ptr); -if (r) { -blkdev_put (bdev, d->dm_dev.mode); -return r; - } - r =bd_link_disk_holder (bdev,dm_disk (md));if (r) { -bd_release (bdev); -blkdev_put (bdev, d->dm_dev.mode); +blkdev_put (bdev, d->dm_dev.mode |FMODE_EXCL );return r; }
@@ -354,9 +347,7 @@ static void close_dev(struct dm_dev_internal *d, struct mapped_device *md)if (!d->dm_dev.bdev)return ; -bd_unlink_disk_holder (d->dm_dev.bdev); -bd_release (d->dm_dev.bdev); -blkdev_put (d->dm_dev.bdev, d->dm_dev.mode); +blkdev_put (d->dm_dev.bdev, d->dm_dev.mode |FMODE_EXCL ); d->dm_dev.bdev =NULL ; }
drivers/md/md.c +3 -11
@@ -1907,7 +1907,6 @@ static void unbind_rdev_from_array(mdk_rdev_t * rdev)MD_BUG ();return ; } -bd_unlink_disk_holder (rdev->bdev);list_del_rcu (&rdev->same_set);printk (KERN_INFO "md: unbind<%s>\n" ,bdevname (rdev->bdev,b)); rdev->mddev =NULL ;
@@ -1935,19 +1934,13 @@ static int lock_rdev(mdk_rdev_t *rdev, dev_t dev, int shared)struct block_device *bdev;char b[BDEVNAME_SIZE ]; - bdev =open_by_devnum (dev,FMODE_READ |FMODE_WRITE ); + bdev =open_by_devnum (dev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , + shared ? (mdk_rdev_t *)lock_rdev : rdev);if (IS_ERR (bdev)) {printk (KERN_ERR "md: could not open %s.\n" ,__bdevname (dev, b));return PTR_ERR (bdev); } - err =bd_claim (bdev, shared ? (mdk_rdev_t *)lock_rdev : rdev); -if (err) { -printk (KERN_ERR "md: could not bd_claim %s.\n" , -bdevname (bdev, b)); -blkdev_put (bdev,FMODE_READ |FMODE_WRITE ); -return err; - }if (!shared)set_bit (AllReserved, &rdev->flags); rdev->bdev = bdev;
@@ -1960,8 +1953,7 @@ static void unlock_rdev(mdk_rdev_t *rdev) rdev->bdev =NULL ;if (!bdev)MD_BUG (); -bd_release (bdev); -blkdev_put (bdev,FMODE_READ |FMODE_WRITE ); +blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); }void md_autodetect_dev (dev_t dev);
drivers/mtd/devices/block2mtd.c +4 -13
@@ -224,7 +224,7 @@ static void block2mtd_free_device(struct block2mtd_dev *dev)if (dev->blkdev) {invalidate_mapping_pages (dev->blkdev->bd_inode->i_mapping,0 ,-1 ); -close_bdev_exclusive (dev->blkdev,FMODE_READ |FMODE_WRITE ); +blkdev_put (dev->blkdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); }kfree (dev);
@@ -254,18 +254,9 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)to resolve the device name by other means. */ dev_t devt =name_to_dev_t (devname); -if (devt) { - bdev =open_by_devnum (devt,FMODE_WRITE |FMODE_READ ); -if (!IS_ERR (bdev)) { -int ret; - ret =bd_claim (bdev, dev); -if (ret) { -blkdev_put (bdev, -FMODE_READ |FMODE_WRITE ); - bdev =ERR_PTR (ret); - } - } - } +if (devt) + bdev =open_by_devnum (devt, + FMODE_READ|FMODE_WRITE|FMODE_EXCL, dev); }#endif
drivers/s390/block/dasd_genhd.c +1 -1
@@ -103,7 +103,7 @@ int dasd_scan_partitions(struct dasd_block *block)struct block_device *bdev; bdev =bdget_disk (block->gdp,0 ); -if (!bdev ||blkdev_get (bdev,FMODE_READ ) <0 ) +if (!bdev ||blkdev_get (bdev,FMODE_READ ,NULL ) <0 )return -ENODEV ;/* * See fs/partition/check.c:register_disk,rescan_partitions
fs/block_dev.c +50 -99
250 lines not on this page · raw message
fs/btrfs/volumes.c +7 -7
@@ -489,7 +489,7 @@ again:continue ;if (device->bdev) { -close_bdev_exclusive (device->bdev, device->mode); +blkdev_put (device->bdev, device->mode |FMODE_EXCL ); device->bdev =NULL ; fs_devices->open_devices--; }
@@ -523,7 +523,7 @@ static int __btrfs_close_devices(struct btrfs_fs_devices *fs_devices)list_for_each_entry (device, &fs_devices->devices, dev_list) {if (device->bdev) { -close_bdev_exclusive (device->bdev, device->mode); +blkdev_put (device->bdev, device->mode |FMODE_EXCL ); fs_devices->open_devices--; }if (device->writeable) {
@@ -638,7 +638,7 @@ static int __btrfs_open_devices(struct btrfs_fs_devices *fs_devices, error_brelse:brelse (bh); error_close: -close_bdev_exclusive (bdev, flags); +blkdev_put (bdev, flags |FMODE_EXCL ); error:continue ; }
@@ -716,7 +716,7 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder,brelse (bh); error_close: -close_bdev_exclusive (bdev, flags); +blkdev_put (bdev, flags |FMODE_EXCL ); error:mutex_unlock (&uuid_mutex);return ret;
@@ -1244,7 +1244,7 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path) root->fs_info->fs_devices->latest_bdev = next_device->bdev;if (device->bdev) { -close_bdev_exclusive (device->bdev, device->mode); +blkdev_put (device->bdev, device->mode |FMODE_EXCL ); device->bdev =NULL ; device->fs_devices->open_devices--; }
@@ -1287,7 +1287,7 @@ error_brelse:brelse (bh); error_close:if (bdev) -close_bdev_exclusive (bdev,FMODE_READ ); +blkdev_put (bdev,FMODE_READ |FMODE_EXCL ); out:mutex_unlock (&root->fs_info->volume_mutex);mutex_unlock (&uuid_mutex);
@@ -1565,7 +1565,7 @@ out:mutex_unlock (&root->fs_info->volume_mutex);return ret; error: -close_bdev_exclusive (bdev,0 ); +blkdev_put (bdev,FMODE_EXCL );if (seeding_dev) {mutex_unlock (&uuid_mutex);up_write (&sb->s_umount);
fs/ext3/super.c +2 -10
@@ -347,7 +347,7 @@ static struct block_device *ext3_blkdev_get(dev_t dev, struct super_block *sb)struct block_device *bdev;char b[BDEVNAME_SIZE ]; - bdev =open_by_devnum (dev,FMODE_READ |FMODE_WRITE ); + bdev =open_by_devnum (dev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , sb);if (IS_ERR (bdev)) goto fail;return bdev;
@@ -364,8 +364,7 @@ fail:*/ static int ext3_blkdev_put (struct block_device *bdev) { -bd_release (bdev); -return blkdev_put (bdev,FMODE_READ |FMODE_WRITE ); +return blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); }static int ext3_blkdev_remove (struct ext3_sb_info *sbi)
@@ -2136,13 +2135,6 @@ static journal_t *ext3_get_dev_journal(struct super_block *sb,if (bdev ==NULL )return NULL ; -if (bd_claim (bdev, sb)) { -ext3_msg (sb,KERN_ERR , -"error: failed to claim external journal device" ); -blkdev_put (bdev,FMODE_READ |FMODE_WRITE ); -return NULL ; - } - blocksize = sb->s_blocksize; hblock =bdev_logical_block_size (bdev);if (blocksize < hblock) {
fs/ext4/super.c +2 -10
@@ -647,7 +647,7 @@ static struct block_device *ext4_blkdev_get(dev_t dev, struct super_block *sb)struct block_device *bdev;char b[BDEVNAME_SIZE ]; - bdev =open_by_devnum (dev,FMODE_READ |FMODE_WRITE ); + bdev =open_by_devnum (dev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , sb);if (IS_ERR (bdev)) goto fail;return bdev;
@@ -663,8 +663,7 @@ fail:*/ static int ext4_blkdev_put (struct block_device *bdev) { -bd_release (bdev); -return blkdev_put (bdev,FMODE_READ |FMODE_WRITE ); +return blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); }static int ext4_blkdev_remove (struct ext4_sb_info *sbi)
@@ -3732,13 +3731,6 @@ static journal_t *ext4_get_dev_journal(struct super_block *sb,if (bdev ==NULL )return NULL ; -if (bd_claim (bdev, sb)) { -ext4_msg (sb,KERN_ERR , -"failed to claim external journal device" ); -blkdev_put (bdev,FMODE_READ |FMODE_WRITE ); -return NULL ; - } - blocksize = sb->s_blocksize; hblock =bdev_logical_block_size (bdev);if (blocksize < hblock) {
fs/gfs2/ops_fstype.c +2 -2
@@ -1298,7 +1298,7 @@ static struct dentry *gfs2_mount(struct file_system_type *fs_type, int flags, goto error_bdev;if (s->s_root) -close_bdev_exclusive (bdev, mode); +blkdev_put (bdev, mode |FMODE_EXCL );memset (&args,0 ,sizeof (args)); args.ar_quota =GFS2_QUOTA_DEFAULT ;
@@ -1342,7 +1342,7 @@ error_super:deactivate_locked_super (s);return ERR_PTR (error); error_bdev: -close_bdev_exclusive (bdev, mode); +blkdev_put (bdev, mode |FMODE_EXCL );return ERR_PTR (error); }
fs/jfs/jfs_logmgr.c +5 -12
@@ -1120,16 +1120,13 @@ int lmLogOpen(struct super_block *sb)* file systems to log may have n-to-1 relationship; */ - bdev =open_by_devnum (sbi->logdev,FMODE_READ |FMODE_WRITE ); + bdev =open_by_devnum (sbi->logdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , + log);if (IS_ERR (bdev)) { rc = -PTR_ERR (bdev); goto free; } -if ((rc =bd_claim (bdev, log))) { - goto close; - } - log->bdev = bdev;memcpy (log->uuid, sbi->loguuid,sizeof (log->uuid));
@@ -1137,7 +1134,7 @@ int lmLogOpen(struct super_block *sb)* initialize log: */ if ((rc =lmLogInit (log))) - goto unclaim; + goto close;list_add (&log->journal_list, &jfs_external_logs);
@@ -1163,11 +1160,8 @@ journal_found:list_del (&log->journal_list);lbmLogShutdown (log); - unclaim: -bd_release (bdev); - close:/* close external log device */ -blkdev_put (bdev,FMODE_READ |FMODE_WRITE ); +blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); free:/* free log descriptor */ mutex_unlock (&jfs_log_mutex);
@@ -1512,8 +1506,7 @@ int lmLogClose(struct super_block *sb) bdev = log->bdev; rc =lmLogShutdown (log); -bd_release (bdev); -blkdev_put (bdev,FMODE_READ |FMODE_WRITE ); +blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL );kfree (log);
fs/logfs/dev_bdev.c +2 -2
@@ -300,7 +300,7 @@ static int bdev_write_sb(struct super_block *sb, struct page *page)static void bdev_put_device (struct logfs_super *s) { -close_bdev_exclusive (s->s_bdev,FMODE_READ |FMODE_WRITE ); +blkdev_put (s->s_bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); }static int bdev_can_write_buf (struct super_block *sb,u64 ofs)
@@ -331,7 +331,7 @@ int logfs_get_sb_bdev(struct logfs_super *p, struct file_system_type *type,if (MAJOR (bdev->bd_dev) ==MTD_BLOCK_MAJOR ) {int mtdnr =MINOR (bdev->bd_dev); -close_bdev_exclusive (bdev,FMODE_READ |FMODE_WRITE ); +blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL );return logfs_get_sb_mtd (p, mtdnr); }
fs/nilfs2/super.c +2 -2
@@ -1233,7 +1233,7 @@ nilfs_mount(struct file_system_type *fs_type, int flags, }if (!s_new) -close_bdev_exclusive (sd.bdev, mode); +blkdev_put (sd.bdev, mode |FMODE_EXCL );return root_dentry;
@@ -1242,7 +1242,7 @@ nilfs_mount(struct file_system_type *fs_type, int flags, failed:if (!s_new) -close_bdev_exclusive (sd.bdev, mode); +blkdev_put (sd.bdev, mode |FMODE_EXCL );return ERR_PTR (err); }
fs/ocfs2/cluster/heartbeat.c +1 -1
@@ -1674,7 +1674,7 @@ static ssize_t o2hb_region_dev_write(struct o2hb_region *reg, goto out; reg->hr_bdev =I_BDEV (filp->f_mapping->host); - ret =blkdev_get (reg->hr_bdev,FMODE_WRITE |FMODE_READ ); + ret =blkdev_get (reg->hr_bdev,FMODE_WRITE |FMODE_READ ,NULL );if (ret) { reg->hr_bdev =NULL ; goto out;
fs/partitions/check.c +1 -1
@@ -549,7 +549,7 @@ void register_disk(struct gendisk *disk) goto exit; bdev->bd_invalidated =1 ; - err =blkdev_get (bdev,FMODE_READ ); + err =blkdev_get (bdev,FMODE_READ ,NULL );if (err <0 ) goto exit;blkdev_put (bdev,FMODE_READ );
fs/reiserfs/journal.c +5 -12
@@ -2552,8 +2552,6 @@ static int release_journal_dev(struct super_block *super, result =0 ;if (journal->j_dev_bd !=NULL ) { -if (journal->j_dev_bd->bd_dev != super->s_dev) -bd_release (journal->j_dev_bd); result =blkdev_put (journal->j_dev_bd, journal->j_dev_mode); journal->j_dev_bd =NULL ; }
@@ -2571,7 +2569,7 @@ static int journal_init_dev(struct super_block *super, {int result;dev_t jdev; -fmode_t blkdev_mode =FMODE_READ |FMODE_WRITE ; +fmode_t blkdev_mode =FMODE_READ |FMODE_WRITE |FMODE_EXCL ;char b[BDEVNAME_SIZE ]; result =0 ;
@@ -2585,7 +2583,9 @@ static int journal_init_dev(struct super_block *super,/* there is no "jdev" option and journal is on separate device */ if ((!jdev_name || !jdev_name[0 ])) { - journal->j_dev_bd =open_by_devnum (jdev, blkdev_mode); +if (jdev == super->s_dev) + blkdev_mode &= ~FMODE_EXCL ; + journal->j_dev_bd =open_by_devnum (jdev, blkdev_mode, journal); journal->j_dev_mode = blkdev_mode;if (IS_ERR (journal->j_dev_bd)) { result =PTR_ERR (journal->j_dev_bd);
@@ -2594,15 +2594,8 @@ static int journal_init_dev(struct super_block *super,"cannot init journal device '%s': %i" , __bdevname(jdev, b), result);return result; - }else if (jdev != super->s_dev) { - result =bd_claim (journal->j_dev_bd, journal); -if (result) { -blkdev_put (journal->j_dev_bd, blkdev_mode); -return result; - } - + }else if (jdev != super->s_dev)set_blocksize (journal->j_dev_bd, super->s_blocksize); - }return 0 ; }
fs/super.c +7 -7
@@ -801,13 +801,13 @@ struct dentry *mount_bdev(struct file_system_type *fs_type,/* * s_umount nests inside bd_mutex during -* __invalidate_device(). close_bdev_exclusive() -* acquires bd_mutex and can't be called under -* s_umount. Drop s_umount temporarily. This is safe -* as we're holding an active reference. +* __invalidate_device(). blkdev_put() acquires +* bd_mutex and can't be called under s_umount. Drop +* s_umount temporarily. This is safe as we're +* holding an active reference. */ up_write (&s->s_umount); -close_bdev_exclusive (bdev, mode); +blkdev_put (bdev, mode |FMODE_EXCL );down_write (&s->s_umount); }else {char b[BDEVNAME_SIZE ];
@@ -831,7 +831,7 @@ struct dentry *mount_bdev(struct file_system_type *fs_type, error_s: error =PTR_ERR (s); error_bdev: -close_bdev_exclusive (bdev, mode); +blkdev_put (bdev, mode |FMODE_EXCL ); error:return ERR_PTR (error); }
@@ -862,7 +862,7 @@ void kill_block_super(struct super_block *sb) bdev->bd_super =NULL ;generic_shutdown_super (sb);sync_blockdev (bdev); -close_bdev_exclusive (bdev, mode); +blkdev_put (bdev, mode |FMODE_EXCL ); }EXPORT_SYMBOL (kill_block_super);
fs/xfs/linux-2.6/xfs_super.c +1 -1
@@ -623,7 +623,7 @@ xfs_blkdev_put( struct block_device *bdev) {if (bdev) -close_bdev_exclusive (bdev,FMODE_READ |FMODE_WRITE ); +blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); }/*
include/linux/fs.h +4 -10
@@ -2007,7 +2007,8 @@ extern struct block_device *bdgrab(struct block_device *bdev);extern void bd_set_size (struct block_device *,loff_t size);extern void bd_forget (struct inode *inode);extern void bdput (struct block_device *); -extern struct block_device *open_by_devnum (dev_t ,fmode_t ); +extern struct block_device *open_by_devnum (dev_t dev,fmode_t mode, +void *holder);extern void invalidate_bdev (struct block_device *);extern int sync_blockdev (struct block_device *bdev);extern struct super_block *freeze_bdev (struct block_device *);
@@ -2038,22 +2039,16 @@ extern const struct file_operations def_fifo_fops;extern int ioctl_by_bdev (struct block_device *,unsigned ,unsigned long );extern int blkdev_ioctl (struct block_device *,fmode_t ,unsigned ,unsigned long );extern long compat_blkdev_ioctl (struct file *,unsigned ,unsigned long ); -extern int blkdev_get (struct block_device *,fmode_t ); -extern int blkdev_put (struct block_device *,fmode_t ); -extern int bd_claim (struct block_device *,void *); -extern void bd_release (struct block_device *); +extern int blkdev_get (struct block_device *bdev,fmode_t mode,void *holder); +extern int blkdev_put (struct block_device *bdev,fmode_t mode);#ifdef CONFIG_SYSFS extern int bd_link_disk_holder (struct block_device *bdev,struct gendisk *disk); -extern void bd_unlink_disk_holder (struct block_device *bdev);#else static inline int bd_link_disk_holder (struct block_device *bdev,struct gendisk *disk) {return 0 ; } -static inline void bd_unlink_disk_holder (struct block_device *bdev) -{ -}#endif #endif
@@ -2090,7 +2085,6 @@ extern const char *__bdevname(dev_t, char *buffer);extern const char *bdevname (struct block_device *bdev,char *buffer);extern struct block_device *lookup_bdev (const char *);extern struct block_device *open_bdev_exclusive (const char *,fmode_t ,void *); -extern void close_bdev_exclusive (struct block_device *,fmode_t );extern void blkdev_show (struct seq_file *,off_t );#else
kernel/power/swap.c +3 -2
@@ -223,7 +223,7 @@ static int swsusp_swap_check(void)return res; root_swap = res; - res =blkdev_get (hib_resume_bdev,FMODE_WRITE ); + res =blkdev_get (hib_resume_bdev,FMODE_WRITE ,NULL );if (res)return res;
@@ -907,7 +907,8 @@ int swsusp_check(void) {int error; - hib_resume_bdev =open_by_devnum (swsusp_resume_device,FMODE_READ ); + hib_resume_bdev =open_by_devnum (swsusp_resume_device, +FMODE_READ ,NULL );if (!IS_ERR (hib_resume_bdev)) {set_blocksize (hib_resume_bdev,PAGE_SIZE );clear_page (swsusp_header);
mm/swapfile.c +4 -3
@@ -1677,7 +1677,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)if (S_ISBLK (inode->i_mode)) {struct block_device *bdev =I_BDEV (inode);set_blocksize (bdev, p->old_block_size); -bd_release (bdev); +blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); }else {mutex_lock (&inode->i_mutex); inode->i_flags &= ~S_SWAPFILE ;
@@ -1939,7 +1939,8 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) error = -EINVAL ;if (S_ISBLK (inode->i_mode)) { bdev =I_BDEV (inode); - error =bd_claim (bdev, sys_swapon); + error =blkdev_get (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , + sys_swapon);if (error <0 ) { bdev =NULL ; error = -EINVAL ;
@@ -2136,7 +2137,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) bad_swap:if (bdev) {set_blocksize (bdev, p->old_block_size); -bd_release (bdev); +blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); }destroy_swap_extents (p);swap_cgroup_swapoff (type);
Signature · 1 line
1.7.1
Jan Kara
reviewerRe: [PATCH 4/5] block: make blkdev_get/put() handle exclusive access
Quoted 13 lines · Tejun Heo
Over time, block layer has accumulated a set of APIs dealing with bdev open, close, claim and release.
* blkdev_get/put() are the primary open and close functions.
* bd_claim/release() deal with exclusive open.
* open/close_bdev_exclusive() are combination of open and claim and the other way around, respectively.
* bd_link/unlink_disk_holder() to create and remove holder/slave symlinks.
Quoted 7 lines
*
open_by_devnum()wrapsbdget()+blkdev_get().The interface is a bit confusing and the decoupling of open and claim makes it impossible to properly guarantee exclusive access as in-kernel open + claim sequence can disturb the existing exclusive open even before the block layer knows the current open if for another exclusive access. Reorganize the interface such that,
...
The patch looks OK to me as far as ext3, ext4, and reiserfs are
concerned. One thing I wondered about when I looked at it - does someone use the 'mode' argument of the blkdev_put() function (well, apart from the exclusive flag)? Because I've looked at a few random disk ->release() functions and none of them used it...
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Re: [PATCH 4/5] block: make blkdev_get/put() handle exclusive access
Hello,
Quoted 6 lines · Jan Kara
On Mon 01-11-10 17:15:28, Tejun Heo wrote:
The patch looks OK to me as far as ext3, ext4, and reiserfs are
concerned. One thing I wondered about when I looked at it - does someone use the 'mode' argument of theblkdev_put()function (well, apart from the exclusive flag)? Because I've looked at a few random disk ->release() functions and none of them used it...
Yeah, I thought about removing @mode and make blkdev_put() take @holder for exclusive releases. From what I can see, it doesn't seem like any implementation cares but it's customary to have access to @mode on ->release(), so I decided to keep it. It's rather flaky as there's no mechanism to check or enforce it tho.
Thanks.
Signature · 1 line
tejun
Re: [PATCH 4/5] block: make blkdev_get/put() handle exclusive access
In reply to Tejun HeoQuoted 8 lines · Tejun Heo
*
blkdev_get()is extended to include exclusive access management. @holder argument is added and, if is @FMODE_EXCL specified, it will gain exclusive access atomically w.r.t. other exclusive accesses.*
blkdev_put()is similarly extended. It now takes @mode argument and if @FMODE_EXCL is set, it releases an exclusive access. Also, when the last exclusive claim is released, the holder/slave symlinks are removed automatically.
Could we get rid of FMODE_EXCL and just make a non-NULL holder field mean to open it exlusively (and pass a holder to the blkdev_put to release it)?
Quoted 2 lines
*
bd_link_disk_holder()remains the same butbd_unlink_disk_holder()is no longer necessary and removed.
That's a rather asymetric interface. What about having blkdev_get_stacked that require a gendisk as holder and set up the links underneath?
Quoted 3 lines
open_bdev_exclusive()andopen_by_devnum()can use further cleanup - rename toblkdev_get_by_path()andblkdev_get_by_devt()and drop special features. Well, let's leave them for another day.
s/blkdev_get_by_devt/blkdev_get_by_dev/
And yes, that rename is a good idea and should go in ASAP after this patch.
Mike Snitzer
Acked-byRe: [PATCH 4/5] block: make blkdev_get/put() handle exclusive access
Quoted 5 lines · Christoph Hellwig
Quoted 4 lines · Tejun Heo
*
blkdev_get()is extended to include exclusive access management. @holder argument is added and, if is @FMODE_EXCL specified, it will gain exclusive access atomically w.r.t. other exclusive accesses.
Quoted 8 lines
Quoted 4 lines
*
blkdev_put()is similarly extended. It now takes @mode argument and if @FMODE_EXCL is set, it releases an exclusive access. Also, when the last exclusive claim is released, the holder/slave symlinks are removed automatically.Could we get rid of
FMODE_EXCLand just make a non-NULL holder field mean to open it exlusively (and pass a holder to theblkdev_putto release it)?
I agree that the need for a FMODE_EXCL flag is awkward. Christoph's proposed change should clean things up nicely.
Other than that, for the DM bits:
Re: [PATCH 4/5] block: make blkdev_get/put() handle exclusive access
In reply to Christoph HellwigHello,
Quoted 5 lines · Christoph Hellwig
Quoted 4 lines · Tejun Heo
*
blkdev_get()is extended to include exclusive access management. @holder argument is added and, if is @FMODE_EXCL specified, it will gain exclusive access atomically w.r.t. other exclusive accesses.
Quoted 8 lines
Quoted 4 lines
*
blkdev_put()is similarly extended. It now takes @mode argument and if @FMODE_EXCL is set, it releases an exclusive access. Also, when the last exclusive claim is released, the holder/slave symlinks are removed automatically.Could we get rid of
FMODE_EXCLand just make a non-NULL holder field mean to open it exlusively (and pass a holder to theblkdev_putto release it)?
Yeah, I agree it's a bit awkward. I'd really like to force one way or the other tho. ie. if non-NULL holder is gonna be required, I'll add WARN_ON_ONCE(mode & FMODE_EXCL). There are several issues to consider.
* As Jan suggested, @mode in blkdev_put() isn't too useful. I decided to keep it and use FMODE_EXCL for exclusive releases as that it is at least useful for something. If we're gonna add @holder to blkdev_put(), it would make more sense to drop @mode. It's not like there's a way to enforce restrictions according to open @mode during device access if there are mixed r/w opens.
* Some users don't keep @holder easily accessible until blkdev_put() is called, so the conversion will take a bit more effort. No big deal in itself.
* What if @holder on blkdev_put() mismatches the current holder? Probably WARN_ON_ONCE() is the only recourse. At that point, it's a bit silly to have to keep @holder around till blkdev_put(). Holders and opners counting already provide meaningful warning mechanism against spurious or missing exclusive releases. Maybe we can have blkdev_put() and blkdev_put_exclusive()? Or make it take boolean @excl?
So, after the above points, I decided to keep @mode. It is a bit awkward but the other way didn't seem too hip either. Any better ideas?
Quoted 6 lines
Quoted 2 lines
*
bd_link_disk_holder()remains the same butbd_unlink_disk_holder()is no longer necessary and removed.That's a rather asymetric interface. What about having
blkdev_get_stackedthat require a gendisk as holder and set up the links underneath?
That will make the number of functions multiplied by two - blkdev_get_by_path_stacked() and blkdev_get_by_dev_stacked(). The symlinking for stacked drivers is an oddball feature which is and will be only used by md and dm. So, I think it's better to keep it separate and oddball.
Quoted 8 lines
Quoted 3 lines
open_bdev_exclusive()andopen_by_devnum()can use further cleanup - rename toblkdev_get_by_path()andblkdev_get_by_devt()and drop special features. Well, let's leave them for another day.s/blkdev_get_by_devt/blkdev_get_by_dev/
And yes, that rename is a good idea and should go in ASAP after this patch.
Alright, will do it.
Thanks.
Signature · 1 line
tejun
Re: [PATCH 4/5] block: make blkdev_get/put() handle exclusive access
Quoted 3 lines · Tejun Heo
So, after the above points, I decided to keep @mode. It is a bit awkward but the other way didn't seem too hip either. Any better ideas?
Let's keep it for now and revisit it later.
Quoted 5 lines
That will make the number of functions multiplied by two -
blkdev_get_by_path_stacked()andblkdev_get_by_dev_stacked(). The symlinking for stacked drivers is an oddball feature which is and will be only used by md and dm. So, I think it's better to keep it separate and oddball.
Oh well. I still don't like it, but let keeps it simple to make progress for now.
PATCH 4/5 block: make blkdev_get/put() handle exclusive access
In reply to Tejun HeoOver time, block layer has accumulated a set of APIs dealing with bdev open, close, claim and release.
* blkdev_get/put() are the primary open and close functions.
* bd_claim/release() deal with exclusive open.
* open/close_bdev_exclusive() are combination of open and claim and the other way around, respectively.
* bd_link/unlink_disk_holder() to create and remove holder/slave symlinks.
* open_by_devnum() wraps bdget() + blkdev_get().
The interface is a bit confusing and the decoupling of open and claim makes it impossible to properly guarantee exclusive access as in-kernel open + claim sequence can disturb the existing exclusive open even before the block layer knows the current open if for another exclusive access. Reorganize the interface such that,
* blkdev_get() is extended to include exclusive access management. @holder argument is added and, if is @FMODE_EXCL specified, it will gain exclusive access atomically w.r.t. other exclusive accesses.
* blkdev_put() is similarly extended. It now takes @mode argument and if @FMODE_EXCL is set, it releases an exclusive access. Also, when the last exclusive claim is released, the holder/slave symlinks are removed automatically.
* bd_claim/release() and close_bdev_exclusive() are no longer necessary and either made static or removed.
* bd_link_disk_holder() remains the same but bd_unlink_disk_holder() is no longer necessary and removed.
* open_bdev_exclusive() becomes a simple wrapper around lookup_bdev() and blkdev_get(). It also has an unexpected extra bdev_read_only() test which probably should be moved into blkdev_get().
* open_by_devnum() is modified to take @holder argument and pass it to blkdev_get().
Most of bdev open/close operations are unified into blkdev_get/put() and most exclusive accesses are tested atomically at the open time (as it should). This cleans up code and removes some, both valid and invalid, but unnecessary all the same, corner cases.
open_bdev_exclusive() and open_by_devnum() can use further cleanup - rename to blkdev_get_by_path() and blkdev_get_by_devt() and drop special features. Well, let's leave them for another day.
Most conversions are straight-forward. drbd conversion is a bit more involved as there was some reordering, but the logic should stay the same.
--- block/ioctl.c | 5 +- drivers/block/drbd/drbd_int.h | 2 - drivers/block/drbd/drbd_main.c | 7 +-- drivers/block/drbd/drbd_nl.c | 105 ++++++++++------------------ drivers/block/pktcdvd.c | 22 ++---- drivers/char/raw.c | 14 +--- drivers/md/dm-table.c | 15 +--- drivers/md/md.c | 14 +--- drivers/mtd/devices/block2mtd.c | 17 +---- drivers/s390/block/dasd_genhd.c | 2 +- fs/block_dev.c | 149 +++++++++++++-------------------------- fs/btrfs/volumes.c | 14 ++-- fs/ext3/super.c | 12 +--- fs/ext4/super.c | 12 +--- fs/gfs2/ops_fstype.c | 4 +- fs/jfs/jfs_logmgr.c | 17 ++--- fs/logfs/dev_bdev.c | 4 +- fs/nilfs2/super.c | 4 +- fs/ocfs2/cluster/heartbeat.c | 2 +- fs/partitions/check.c | 2 +- fs/reiserfs/journal.c | 17 ++--- fs/super.c | 14 ++-- fs/xfs/linux-2.6/xfs_super.c | 2 +- include/linux/fs.h | 14 +--- kernel/power/swap.c | 5 +- mm/swapfile.c | 7 +- 26 files changed, 163 insertions(+), 319 deletions(-)
block/ioctl.c +3 -2
@@ -294,11 +294,12 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,return -EINVAL ;if (get_user (n, (int __user *) arg))return -EFAULT ; -if (!(mode &FMODE_EXCL ) &&bd_claim (bdev, &bdev) <0 ) +if (!(mode &FMODE_EXCL ) && +blkdev_get (bdev, mode |FMODE_EXCL , &bdev) <0 )return -EBUSY ; ret =set_blocksize (bdev, n);if (!(mode &FMODE_EXCL )) -bd_release (bdev); +blkdev_put (bdev, mode |FMODE_EXCL );return ret;case BLKPG : ret =blkpg_ioctl (bdev, (struct blkpg_ioctl_arg __user *) arg);
drivers/block/drbd/drbd_int.h +0 -2
@@ -923,8 +923,6 @@ struct drbd_md {struct drbd_backing_dev {struct block_device *backing_bdev;struct block_device *md_bdev; -struct file *lo_file; -struct file *md_file;struct drbd_md md;struct disk_conf dc;/* The user provided config... */ sector_t known_size;/* last known size of that backing device */
drivers/block/drbd/drbd_main.c +2 -5
@@ -3361,11 +3361,8 @@ void drbd_free_bc(struct drbd_backing_dev *ldev)if (ldev ==NULL )return ; -bd_release (ldev->backing_bdev); -bd_release (ldev->md_bdev); - -fput (ldev->lo_file); -fput (ldev->md_file); +blkdev_put (ldev->backing_bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); +blkdev_put (ldev->md_bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL );kfree (ldev); }
drivers/block/drbd/drbd_nl.c +36 -67
163 lines not on this page · raw message
drivers/block/pktcdvd.c +8 -14
@@ -2296,15 +2296,12 @@ static int pkt_open_dev(struct pktcdvd_device *pd, fmode_t write)* so bdget() can't fail. */ bdget (pd->bdev->bd_dev); -if ((ret =blkdev_get (pd->bdev,FMODE_READ ))) +if ((ret =blkdev_get (pd->bdev,FMODE_READ |FMODE_EXCL , pd))) goto out; -if ((ret =bd_claim (pd->bdev, pd))) - goto out_putdev; -if ((ret =pkt_get_last_written (pd, &lba))) {printk (DRIVER_NAME ": pkt_get_last_written failed\n" ); - goto out_unclaim; + goto out_putdev; }set_capacity (pd->disk, lba <<2 );
@@ -2314,7 +2311,7 @@ static int pkt_open_dev(struct pktcdvd_device *pd, fmode_t write) q =bdev_get_queue (pd->bdev);if (write) {if ((ret =pkt_open_write (pd))) - goto out_unclaim; + goto out_putdev;/* * Some CDRW drives can not handle writes larger than one packet, * even if the size is a multiple of the packet size.
@@ -2329,23 +2326,21 @@ static int pkt_open_dev(struct pktcdvd_device *pd, fmode_t write) }if ((ret =pkt_set_segment_merging (pd, q))) - goto out_unclaim; + goto out_putdev;if (write) {if (!pkt_grow_pktlist (pd,CONFIG_CDROM_PKTCDVD_BUFFERS )) {printk (DRIVER_NAME ": not enough memory for buffers\n" ); ret = -ENOMEM ; - goto out_unclaim; + goto out_putdev; }printk (DRIVER_NAME ": %lukB available on disc\n" , lba <<1 ); }return 0 ; -out_unclaim: -bd_release (pd->bdev); out_putdev: -blkdev_put (pd->bdev,FMODE_READ ); +blkdev_put (pd->bdev,FMODE_READ |FMODE_EXCL ); out:return ret; }
@@ -2362,8 +2357,7 @@ static void pkt_release_dev(struct pktcdvd_device *pd, int flush)pkt_lock_door (pd,0 );pkt_set_speed (pd,MAX_SPEED ,MAX_SPEED ); -bd_release (pd->bdev); -blkdev_put (pd->bdev,FMODE_READ ); +blkdev_put (pd->bdev,FMODE_READ |FMODE_EXCL );pkt_shrink_pktlist (pd); }
@@ -2733,7 +2727,7 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev) bdev =bdget (dev);if (!bdev)return -ENOMEM ; - ret =blkdev_get (bdev,FMODE_READ |FMODE_NDELAY ); + ret =blkdev_get (bdev,FMODE_READ |FMODE_NDELAY ,NULL );if (ret)return ret;
drivers/char/raw.c +4 -10
@@ -65,15 +65,12 @@ static int raw_open(struct inode *inode, struct file *filp)if (!bdev) goto out;igrab (bdev->bd_inode); - err =blkdev_get (bdev, filp->f_mode); + err =blkdev_get (bdev, filp->f_mode |FMODE_EXCL , raw_open);if (err) goto out; - err =bd_claim (bdev, raw_open); -if (err) - goto out1; err =set_blocksize (bdev,bdev_logical_block_size (bdev));if (err) - goto out2; + goto out1; filp->f_flags |=O_DIRECT ; filp->f_mapping = bdev->bd_inode->i_mapping;if (++raw_devices[minor].inuse ==1 )
@@ -83,10 +80,8 @@ static int raw_open(struct inode *inode, struct file *filp)mutex_unlock (&raw_mutex);return 0 ; -out2: -bd_release (bdev); out1: -blkdev_put (bdev, filp->f_mode); +blkdev_put (bdev, filp->f_mode |FMODE_EXCL ); out:mutex_unlock (&raw_mutex);return err;
@@ -110,8 +105,7 @@ static int raw_release(struct inode *inode, struct file *filp) }mutex_unlock (&raw_mutex); -bd_release (bdev); -blkdev_put (bdev, filp->f_mode); +blkdev_put (bdev, filp->f_mode |FMODE_EXCL );return 0 ; }
drivers/md/dm-table.c +3 -12
@@ -325,20 +325,13 @@ static int open_dev(struct dm_dev_internal *d, dev_t dev,BUG_ON (d->dm_dev.bdev); - bdev =open_by_devnum (dev, d->dm_dev.mode); + bdev =open_by_devnum (dev, d->dm_dev.mode |FMODE_EXCL , _claim_ptr);if (IS_ERR (bdev))return PTR_ERR (bdev); - r =bd_claim (bdev, _claim_ptr); -if (r) { -blkdev_put (bdev, d->dm_dev.mode); -return r; - } - r =bd_link_disk_holder (bdev,dm_disk (md));if (r) { -bd_release (bdev); -blkdev_put (bdev, d->dm_dev.mode); +blkdev_put (bdev, d->dm_dev.mode |FMODE_EXCL );return r; }
@@ -354,9 +347,7 @@ static void close_dev(struct dm_dev_internal *d, struct mapped_device *md)if (!d->dm_dev.bdev)return ; -bd_unlink_disk_holder (d->dm_dev.bdev); -bd_release (d->dm_dev.bdev); -blkdev_put (d->dm_dev.bdev, d->dm_dev.mode); +blkdev_put (d->dm_dev.bdev, d->dm_dev.mode |FMODE_EXCL ); d->dm_dev.bdev =NULL ; }
drivers/md/md.c +3 -11
@@ -1907,7 +1907,6 @@ static void unbind_rdev_from_array(mdk_rdev_t * rdev)MD_BUG ();return ; } -bd_unlink_disk_holder (rdev->bdev);list_del_rcu (&rdev->same_set);printk (KERN_INFO "md: unbind<%s>\n" ,bdevname (rdev->bdev,b)); rdev->mddev =NULL ;
@@ -1935,19 +1934,13 @@ static int lock_rdev(mdk_rdev_t *rdev, dev_t dev, int shared)struct block_device *bdev;char b[BDEVNAME_SIZE ]; - bdev =open_by_devnum (dev,FMODE_READ |FMODE_WRITE ); + bdev =open_by_devnum (dev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , + shared ? (mdk_rdev_t *)lock_rdev : rdev);if (IS_ERR (bdev)) {printk (KERN_ERR "md: could not open %s.\n" ,__bdevname (dev, b));return PTR_ERR (bdev); } - err =bd_claim (bdev, shared ? (mdk_rdev_t *)lock_rdev : rdev); -if (err) { -printk (KERN_ERR "md: could not bd_claim %s.\n" , -bdevname (bdev, b)); -blkdev_put (bdev,FMODE_READ |FMODE_WRITE ); -return err; - }if (!shared)set_bit (AllReserved, &rdev->flags); rdev->bdev = bdev;
@@ -1960,8 +1953,7 @@ static void unlock_rdev(mdk_rdev_t *rdev) rdev->bdev =NULL ;if (!bdev)MD_BUG (); -bd_release (bdev); -blkdev_put (bdev,FMODE_READ |FMODE_WRITE ); +blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); }void md_autodetect_dev (dev_t dev);
drivers/mtd/devices/block2mtd.c +4 -13
@@ -224,7 +224,7 @@ static void block2mtd_free_device(struct block2mtd_dev *dev)if (dev->blkdev) {invalidate_mapping_pages (dev->blkdev->bd_inode->i_mapping,0 ,-1 ); -close_bdev_exclusive (dev->blkdev,FMODE_READ |FMODE_WRITE ); +blkdev_put (dev->blkdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); }kfree (dev);
@@ -254,18 +254,9 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)to resolve the device name by other means. */ dev_t devt =name_to_dev_t (devname); -if (devt) { - bdev =open_by_devnum (devt,FMODE_WRITE |FMODE_READ ); -if (!IS_ERR (bdev)) { -int ret; - ret =bd_claim (bdev, dev); -if (ret) { -blkdev_put (bdev, -FMODE_READ |FMODE_WRITE ); - bdev =ERR_PTR (ret); - } - } - } +if (devt) + bdev =open_by_devnum (devt, + FMODE_READ|FMODE_WRITE|FMODE_EXCL, dev); }#endif
drivers/s390/block/dasd_genhd.c +1 -1
@@ -103,7 +103,7 @@ int dasd_scan_partitions(struct dasd_block *block)struct block_device *bdev; bdev =bdget_disk (block->gdp,0 ); -if (!bdev ||blkdev_get (bdev,FMODE_READ ) <0 ) +if (!bdev ||blkdev_get (bdev,FMODE_READ ,NULL ) <0 )return -ENODEV ;/* * See fs/partition/check.c:register_disk,rescan_partitions
fs/block_dev.c +50 -99
250 lines not on this page · raw message
fs/btrfs/volumes.c +7 -7
@@ -489,7 +489,7 @@ again:continue ;if (device->bdev) { -close_bdev_exclusive (device->bdev, device->mode); +blkdev_put (device->bdev, device->mode |FMODE_EXCL ); device->bdev =NULL ; fs_devices->open_devices--; }
@@ -523,7 +523,7 @@ static int __btrfs_close_devices(struct btrfs_fs_devices *fs_devices)list_for_each_entry (device, &fs_devices->devices, dev_list) {if (device->bdev) { -close_bdev_exclusive (device->bdev, device->mode); +blkdev_put (device->bdev, device->mode |FMODE_EXCL ); fs_devices->open_devices--; }if (device->writeable) {
@@ -638,7 +638,7 @@ static int __btrfs_open_devices(struct btrfs_fs_devices *fs_devices, error_brelse:brelse (bh); error_close: -close_bdev_exclusive (bdev, flags); +blkdev_put (bdev, flags |FMODE_EXCL ); error:continue ; }
@@ -716,7 +716,7 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder,brelse (bh); error_close: -close_bdev_exclusive (bdev, flags); +blkdev_put (bdev, flags |FMODE_EXCL ); error:mutex_unlock (&uuid_mutex);return ret;
@@ -1244,7 +1244,7 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path) root->fs_info->fs_devices->latest_bdev = next_device->bdev;if (device->bdev) { -close_bdev_exclusive (device->bdev, device->mode); +blkdev_put (device->bdev, device->mode |FMODE_EXCL ); device->bdev =NULL ; device->fs_devices->open_devices--; }
@@ -1287,7 +1287,7 @@ error_brelse:brelse (bh); error_close:if (bdev) -close_bdev_exclusive (bdev,FMODE_READ ); +blkdev_put (bdev,FMODE_READ |FMODE_EXCL ); out:mutex_unlock (&root->fs_info->volume_mutex);mutex_unlock (&uuid_mutex);
@@ -1565,7 +1565,7 @@ out:mutex_unlock (&root->fs_info->volume_mutex);return ret; error: -close_bdev_exclusive (bdev,0 ); +blkdev_put (bdev,FMODE_EXCL );if (seeding_dev) {mutex_unlock (&uuid_mutex);up_write (&sb->s_umount);
fs/ext3/super.c +2 -10
@@ -347,7 +347,7 @@ static struct block_device *ext3_blkdev_get(dev_t dev, struct super_block *sb)struct block_device *bdev;char b[BDEVNAME_SIZE ]; - bdev =open_by_devnum (dev,FMODE_READ |FMODE_WRITE ); + bdev =open_by_devnum (dev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , sb);if (IS_ERR (bdev)) goto fail;return bdev;
@@ -364,8 +364,7 @@ fail:*/ static int ext3_blkdev_put (struct block_device *bdev) { -bd_release (bdev); -return blkdev_put (bdev,FMODE_READ |FMODE_WRITE ); +return blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); }static int ext3_blkdev_remove (struct ext3_sb_info *sbi)
@@ -2136,13 +2135,6 @@ static journal_t *ext3_get_dev_journal(struct super_block *sb,if (bdev ==NULL )return NULL ; -if (bd_claim (bdev, sb)) { -ext3_msg (sb,KERN_ERR , -"error: failed to claim external journal device" ); -blkdev_put (bdev,FMODE_READ |FMODE_WRITE ); -return NULL ; - } - blocksize = sb->s_blocksize; hblock =bdev_logical_block_size (bdev);if (blocksize < hblock) {
fs/ext4/super.c +2 -10
@@ -647,7 +647,7 @@ static struct block_device *ext4_blkdev_get(dev_t dev, struct super_block *sb)struct block_device *bdev;char b[BDEVNAME_SIZE ]; - bdev =open_by_devnum (dev,FMODE_READ |FMODE_WRITE ); + bdev =open_by_devnum (dev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , sb);if (IS_ERR (bdev)) goto fail;return bdev;
@@ -663,8 +663,7 @@ fail:*/ static int ext4_blkdev_put (struct block_device *bdev) { -bd_release (bdev); -return blkdev_put (bdev,FMODE_READ |FMODE_WRITE ); +return blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); }static int ext4_blkdev_remove (struct ext4_sb_info *sbi)
@@ -3732,13 +3731,6 @@ static journal_t *ext4_get_dev_journal(struct super_block *sb,if (bdev ==NULL )return NULL ; -if (bd_claim (bdev, sb)) { -ext4_msg (sb,KERN_ERR , -"failed to claim external journal device" ); -blkdev_put (bdev,FMODE_READ |FMODE_WRITE ); -return NULL ; - } - blocksize = sb->s_blocksize; hblock =bdev_logical_block_size (bdev);if (blocksize < hblock) {
fs/gfs2/ops_fstype.c +2 -2
@@ -1298,7 +1298,7 @@ static struct dentry *gfs2_mount(struct file_system_type *fs_type, int flags, goto error_bdev;if (s->s_root) -close_bdev_exclusive (bdev, mode); +blkdev_put (bdev, mode |FMODE_EXCL );memset (&args,0 ,sizeof (args)); args.ar_quota =GFS2_QUOTA_DEFAULT ;
@@ -1342,7 +1342,7 @@ error_super:deactivate_locked_super (s);return ERR_PTR (error); error_bdev: -close_bdev_exclusive (bdev, mode); +blkdev_put (bdev, mode |FMODE_EXCL );return ERR_PTR (error); }
fs/jfs/jfs_logmgr.c +5 -12
@@ -1120,16 +1120,13 @@ int lmLogOpen(struct super_block *sb)* file systems to log may have n-to-1 relationship; */ - bdev =open_by_devnum (sbi->logdev,FMODE_READ |FMODE_WRITE ); + bdev =open_by_devnum (sbi->logdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , + log);if (IS_ERR (bdev)) { rc = -PTR_ERR (bdev); goto free; } -if ((rc =bd_claim (bdev, log))) { - goto close; - } - log->bdev = bdev;memcpy (log->uuid, sbi->loguuid,sizeof (log->uuid));
@@ -1137,7 +1134,7 @@ int lmLogOpen(struct super_block *sb)* initialize log: */ if ((rc =lmLogInit (log))) - goto unclaim; + goto close;list_add (&log->journal_list, &jfs_external_logs);
@@ -1163,11 +1160,8 @@ journal_found:list_del (&log->journal_list);lbmLogShutdown (log); - unclaim: -bd_release (bdev); - close:/* close external log device */ -blkdev_put (bdev,FMODE_READ |FMODE_WRITE ); +blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); free:/* free log descriptor */ mutex_unlock (&jfs_log_mutex);
@@ -1512,8 +1506,7 @@ int lmLogClose(struct super_block *sb) bdev = log->bdev; rc =lmLogShutdown (log); -bd_release (bdev); -blkdev_put (bdev,FMODE_READ |FMODE_WRITE ); +blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL );kfree (log);
fs/logfs/dev_bdev.c +2 -2
@@ -300,7 +300,7 @@ static int bdev_write_sb(struct super_block *sb, struct page *page)static void bdev_put_device (struct logfs_super *s) { -close_bdev_exclusive (s->s_bdev,FMODE_READ |FMODE_WRITE ); +blkdev_put (s->s_bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); }static int bdev_can_write_buf (struct super_block *sb,u64 ofs)
@@ -331,7 +331,7 @@ int logfs_get_sb_bdev(struct logfs_super *p, struct file_system_type *type,if (MAJOR (bdev->bd_dev) ==MTD_BLOCK_MAJOR ) {int mtdnr =MINOR (bdev->bd_dev); -close_bdev_exclusive (bdev,FMODE_READ |FMODE_WRITE ); +blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL );return logfs_get_sb_mtd (p, mtdnr); }
fs/nilfs2/super.c +2 -2
@@ -1233,7 +1233,7 @@ nilfs_mount(struct file_system_type *fs_type, int flags, }if (!s_new) -close_bdev_exclusive (sd.bdev, mode); +blkdev_put (sd.bdev, mode |FMODE_EXCL );return root_dentry;
@@ -1242,7 +1242,7 @@ nilfs_mount(struct file_system_type *fs_type, int flags, failed:if (!s_new) -close_bdev_exclusive (sd.bdev, mode); +blkdev_put (sd.bdev, mode |FMODE_EXCL );return ERR_PTR (err); }
fs/ocfs2/cluster/heartbeat.c +1 -1
@@ -1674,7 +1674,7 @@ static ssize_t o2hb_region_dev_write(struct o2hb_region *reg, goto out; reg->hr_bdev =I_BDEV (filp->f_mapping->host); - ret =blkdev_get (reg->hr_bdev,FMODE_WRITE |FMODE_READ ); + ret =blkdev_get (reg->hr_bdev,FMODE_WRITE |FMODE_READ ,NULL );if (ret) { reg->hr_bdev =NULL ; goto out;
fs/partitions/check.c +1 -1
@@ -549,7 +549,7 @@ void register_disk(struct gendisk *disk) goto exit; bdev->bd_invalidated =1 ; - err =blkdev_get (bdev,FMODE_READ ); + err =blkdev_get (bdev,FMODE_READ ,NULL );if (err <0 ) goto exit;blkdev_put (bdev,FMODE_READ );
fs/reiserfs/journal.c +5 -12
@@ -2552,8 +2552,6 @@ static int release_journal_dev(struct super_block *super, result =0 ;if (journal->j_dev_bd !=NULL ) { -if (journal->j_dev_bd->bd_dev != super->s_dev) -bd_release (journal->j_dev_bd); result =blkdev_put (journal->j_dev_bd, journal->j_dev_mode); journal->j_dev_bd =NULL ; }
@@ -2571,7 +2569,7 @@ static int journal_init_dev(struct super_block *super, {int result;dev_t jdev; -fmode_t blkdev_mode =FMODE_READ |FMODE_WRITE ; +fmode_t blkdev_mode =FMODE_READ |FMODE_WRITE |FMODE_EXCL ;char b[BDEVNAME_SIZE ]; result =0 ;
@@ -2585,7 +2583,9 @@ static int journal_init_dev(struct super_block *super,/* there is no "jdev" option and journal is on separate device */ if ((!jdev_name || !jdev_name[0 ])) { - journal->j_dev_bd =open_by_devnum (jdev, blkdev_mode); +if (jdev == super->s_dev) + blkdev_mode &= ~FMODE_EXCL ; + journal->j_dev_bd =open_by_devnum (jdev, blkdev_mode, journal); journal->j_dev_mode = blkdev_mode;if (IS_ERR (journal->j_dev_bd)) { result =PTR_ERR (journal->j_dev_bd);
@@ -2594,15 +2594,8 @@ static int journal_init_dev(struct super_block *super,"cannot init journal device '%s': %i" , __bdevname(jdev, b), result);return result; - }else if (jdev != super->s_dev) { - result =bd_claim (journal->j_dev_bd, journal); -if (result) { -blkdev_put (journal->j_dev_bd, blkdev_mode); -return result; - } - + }else if (jdev != super->s_dev)set_blocksize (journal->j_dev_bd, super->s_blocksize); - }return 0 ; }
fs/super.c +7 -7
@@ -801,13 +801,13 @@ struct dentry *mount_bdev(struct file_system_type *fs_type,/* * s_umount nests inside bd_mutex during -* __invalidate_device(). close_bdev_exclusive() -* acquires bd_mutex and can't be called under -* s_umount. Drop s_umount temporarily. This is safe -* as we're holding an active reference. +* __invalidate_device(). blkdev_put() acquires +* bd_mutex and can't be called under s_umount. Drop +* s_umount temporarily. This is safe as we're +* holding an active reference. */ up_write (&s->s_umount); -close_bdev_exclusive (bdev, mode); +blkdev_put (bdev, mode |FMODE_EXCL );down_write (&s->s_umount); }else {char b[BDEVNAME_SIZE ];
@@ -831,7 +831,7 @@ struct dentry *mount_bdev(struct file_system_type *fs_type, error_s: error =PTR_ERR (s); error_bdev: -close_bdev_exclusive (bdev, mode); +blkdev_put (bdev, mode |FMODE_EXCL ); error:return ERR_PTR (error); }
@@ -862,7 +862,7 @@ void kill_block_super(struct super_block *sb) bdev->bd_super =NULL ;generic_shutdown_super (sb);sync_blockdev (bdev); -close_bdev_exclusive (bdev, mode); +blkdev_put (bdev, mode |FMODE_EXCL ); }EXPORT_SYMBOL (kill_block_super);
fs/xfs/linux-2.6/xfs_super.c +1 -1
@@ -623,7 +623,7 @@ xfs_blkdev_put( struct block_device *bdev) {if (bdev) -close_bdev_exclusive (bdev,FMODE_READ |FMODE_WRITE ); +blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); }/*
include/linux/fs.h +4 -10
@@ -2007,7 +2007,8 @@ extern struct block_device *bdgrab(struct block_device *bdev);extern void bd_set_size (struct block_device *,loff_t size);extern void bd_forget (struct inode *inode);extern void bdput (struct block_device *); -extern struct block_device *open_by_devnum (dev_t ,fmode_t ); +extern struct block_device *open_by_devnum (dev_t dev,fmode_t mode, +void *holder);extern void invalidate_bdev (struct block_device *);extern int sync_blockdev (struct block_device *bdev);extern struct super_block *freeze_bdev (struct block_device *);
@@ -2038,22 +2039,16 @@ extern const struct file_operations def_fifo_fops;extern int ioctl_by_bdev (struct block_device *,unsigned ,unsigned long );extern int blkdev_ioctl (struct block_device *,fmode_t ,unsigned ,unsigned long );extern long compat_blkdev_ioctl (struct file *,unsigned ,unsigned long ); -extern int blkdev_get (struct block_device *,fmode_t ); -extern int blkdev_put (struct block_device *,fmode_t ); -extern int bd_claim (struct block_device *,void *); -extern void bd_release (struct block_device *); +extern int blkdev_get (struct block_device *bdev,fmode_t mode,void *holder); +extern int blkdev_put (struct block_device *bdev,fmode_t mode);#ifdef CONFIG_SYSFS extern int bd_link_disk_holder (struct block_device *bdev,struct gendisk *disk); -extern void bd_unlink_disk_holder (struct block_device *bdev);#else static inline int bd_link_disk_holder (struct block_device *bdev,struct gendisk *disk) {return 0 ; } -static inline void bd_unlink_disk_holder (struct block_device *bdev) -{ -}#endif #endif
@@ -2090,7 +2085,6 @@ extern const char *__bdevname(dev_t, char *buffer);extern const char *bdevname (struct block_device *bdev,char *buffer);extern struct block_device *lookup_bdev (const char *);extern struct block_device *open_bdev_exclusive (const char *,fmode_t ,void *); -extern void close_bdev_exclusive (struct block_device *,fmode_t );extern void blkdev_show (struct seq_file *,off_t );#else
kernel/power/swap.c +3 -2
@@ -223,7 +223,7 @@ static int swsusp_swap_check(void)return res; root_swap = res; - res =blkdev_get (hib_resume_bdev,FMODE_WRITE ); + res =blkdev_get (hib_resume_bdev,FMODE_WRITE ,NULL );if (res)return res;
@@ -907,7 +907,8 @@ int swsusp_check(void) {int error; - hib_resume_bdev =open_by_devnum (swsusp_resume_device,FMODE_READ ); + hib_resume_bdev =open_by_devnum (swsusp_resume_device, +FMODE_READ ,NULL );if (!IS_ERR (hib_resume_bdev)) {set_blocksize (hib_resume_bdev,PAGE_SIZE );clear_page (swsusp_header);
mm/swapfile.c +4 -3
@@ -1677,7 +1677,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)if (S_ISBLK (inode->i_mode)) {struct block_device *bdev =I_BDEV (inode);set_blocksize (bdev, p->old_block_size); -bd_release (bdev); +blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); }else {mutex_lock (&inode->i_mutex); inode->i_flags &= ~S_SWAPFILE ;
@@ -1939,7 +1939,8 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) error = -EINVAL ;if (S_ISBLK (inode->i_mode)) { bdev =I_BDEV (inode); - error =bd_claim (bdev, sys_swapon); + error =blkdev_get (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , + sys_swapon);if (error <0 ) { bdev =NULL ; error = -EINVAL ;
@@ -2136,7 +2137,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) bad_swap:if (bdev) {set_blocksize (bdev, p->old_block_size); -bd_release (bdev); +blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); }destroy_swap_extents (p);swap_cgroup_swapoff (type);
Signature · 1 line
1.7.1
PATCH 5/5 block: reorganize claim/release implementation
In reply to Tejun HeoWith claim/release rolled into blkdev_get/put(), there's no reason to keep bd_abort/finish_claim(), __bd_claim() and bd_release() as separate functions. It only makes the code difficult to follow. Collapse them into blkdev_get/put(). This will ease future changes around claim/release.
--- fs/block_dev.c | 127 +++++++++++++++++++++----------------------------------- 1 files changed, 48 insertions(+), 79 deletions(-)
fs/block_dev.c +48 -79
@@ -772,79 +772,6 @@ static struct block_device *bd_start_claiming(struct block_device *bdev, } } -/* releases bdev_lock */ -static void __bd_abort_claiming (struct block_device *whole,void *holder) -{ -BUG_ON (whole->bd_claiming != holder); - whole->bd_claiming =NULL ; -wake_up_bit (&whole->bd_claiming,0 ); - -spin_unlock (&bdev_lock); -bdput (whole); -} - -/** -* bd_abort_claiming - abort claiming a block device -* @whole: whole block device returned by bd_start_claiming() -* @holder: holder trying to claim @bdev -* -* Abort a claiming block started by bd_start_claiming(). Note that -* @whole is not the block device to be claimed but the whole device -* returned by bd_start_claiming(). -* -* CONTEXT: -* Grabs and releases bdev_lock. -*/ -static void bd_abort_claiming (struct block_device *whole,void *holder) -{ -spin_lock (&bdev_lock); -__bd_abort_claiming (whole, holder);/* releases bdev_lock */ -} - -/* increment holders when we have a legitimate claim. requires bdev_lock */ -static void __bd_claim (struct block_device *bdev,struct block_device *whole, -void *holder) -{ -/* note that for a whole device bd_holders -* will be incremented twice, and bd_holder will -* be set to bd_may_claim before being set to holder -*/ - whole->bd_holders++; - whole->bd_holder = bd_may_claim; - bdev->bd_holders++; - bdev->bd_holder = holder; -} - -/** -* bd_finish_claiming - finish claiming a block device -* @bdev: block device of interest (passed to bd_start_claiming()) -* @whole: whole block device returned by bd_start_claiming() -* @holder: holder trying to claim @bdev -* -* Finish a claiming block started by bd_start_claiming(). -* -* CONTEXT: -* Grabs and releases bdev_lock. -*/ -static void bd_finish_claiming (struct block_device *bdev, -struct block_device *whole,void *holder) -{ -spin_lock (&bdev_lock); -BUG_ON (!bd_may_claim (bdev, whole, holder)); -__bd_claim (bdev, whole, holder); -__bd_abort_claiming (whole, holder);/* not actually an abort */ -} - -static void bd_release (struct block_device *bdev) -{ -spin_lock (&bdev_lock); -if (!--bdev->bd_contains->bd_holders) - bdev->bd_contains->bd_holder =NULL ; -if (!--bdev->bd_holders) - bdev->bd_holder =NULL ; -spin_unlock (&bdev_lock); -} -#ifdef CONFIG_SYSFS static int add_symlink (struct kobject *from,struct kobject *to) {
@@ -1223,10 +1150,30 @@ int blkdev_get(struct block_device *bdev, fmode_t mode, void *holder) res =__blkdev_get (bdev, mode,0 );if (whole) { -if (res ==0 ) -bd_finish_claiming (bdev, whole, holder); -else -bd_abort_claiming (whole, holder); +/* finish claiming */ +spin_lock (&bdev_lock); + +if (res ==0 ) { +BUG_ON (!bd_may_claim (bdev, whole, holder)); +/* +* Note that for a whole device bd_holders +* will be incremented twice, and bd_holder +* will be set to bd_may_claim before being +* set to holder +*/ + whole->bd_holders++; + whole->bd_holder = bd_may_claim; + bdev->bd_holders++; + bdev->bd_holder = holder; + } + +/* tell others that we're done */ +BUG_ON (whole->bd_claiming != holder); + whole->bd_claiming =NULL ; +wake_up_bit (&whole->bd_claiming,0 ); + +spin_unlock (&bdev_lock); +bdput (whole); }return res;
@@ -1272,6 +1219,7 @@ static int __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part) bdev->bd_part_count--;if (!--bdev->bd_openers) { +WARN_ON_ONCE (bdev->bd_holders);sync_blockdev (bdev);kill_bdev (bdev); }
@@ -1303,10 +1251,31 @@ static int __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part)int blkdev_put (struct block_device *bdev,fmode_t mode) {if (mode &FMODE_EXCL ) { +bool bdev_free; + +/* +* Release a claim on the device. The holder fields +* are protected with bdev_lock. bd_mutex is to +* synchronize disk_holder unlinking. +*/ mutex_lock (&bdev->bd_mutex); -bd_release (bdev); -if (!bdev->bd_holders) +spin_lock (&bdev_lock); + +WARN_ON_ONCE (--bdev->bd_holders <0 ); +WARN_ON_ONCE (--bdev->bd_contains->bd_holders <0 ); + +/* bd_contains might point to self, check in a separate step */ +if ((bdev_free = !bdev->bd_holders)) + bdev->bd_holder =NULL ; +if (!bdev->bd_contains->bd_holders) + bdev->bd_contains->bd_holder =NULL ; + +spin_unlock (&bdev_lock); + +/* if this was the last claim, holder link should go too */ +if (bdev_free)bd_unlink_disk_holder (bdev); +mutex_unlock (&bdev->bd_mutex); }return __blkdev_put (bdev, mode,0 );
Signature · 1 line
1.7.1
PATCH 5/5 block: reorganize claim/release implementation
In reply to Tejun HeoWith claim/release rolled into blkdev_get/put(), there's no reason to keep bd_abort/finish_claim(), __bd_claim() and bd_release() as separate functions. It only makes the code difficult to follow. Collapse them into blkdev_get/put(). This will ease future changes around claim/release.
--- fs/block_dev.c | 127 +++++++++++++++++++++----------------------------------- 1 files changed, 48 insertions(+), 79 deletions(-)
fs/block_dev.c +48 -79
@@ -772,79 +772,6 @@ static struct block_device *bd_start_claiming(struct block_device *bdev, } } -/* releases bdev_lock */ -static void __bd_abort_claiming (struct block_device *whole,void *holder) -{ -BUG_ON (whole->bd_claiming != holder); - whole->bd_claiming =NULL ; -wake_up_bit (&whole->bd_claiming,0 ); - -spin_unlock (&bdev_lock); -bdput (whole); -} - -/** -* bd_abort_claiming - abort claiming a block device -* @whole: whole block device returned by bd_start_claiming() -* @holder: holder trying to claim @bdev -* -* Abort a claiming block started by bd_start_claiming(). Note that -* @whole is not the block device to be claimed but the whole device -* returned by bd_start_claiming(). -* -* CONTEXT: -* Grabs and releases bdev_lock. -*/ -static void bd_abort_claiming (struct block_device *whole,void *holder) -{ -spin_lock (&bdev_lock); -__bd_abort_claiming (whole, holder);/* releases bdev_lock */ -} - -/* increment holders when we have a legitimate claim. requires bdev_lock */ -static void __bd_claim (struct block_device *bdev,struct block_device *whole, -void *holder) -{ -/* note that for a whole device bd_holders -* will be incremented twice, and bd_holder will -* be set to bd_may_claim before being set to holder -*/ - whole->bd_holders++; - whole->bd_holder = bd_may_claim; - bdev->bd_holders++; - bdev->bd_holder = holder; -} - -/** -* bd_finish_claiming - finish claiming a block device -* @bdev: block device of interest (passed to bd_start_claiming()) -* @whole: whole block device returned by bd_start_claiming() -* @holder: holder trying to claim @bdev -* -* Finish a claiming block started by bd_start_claiming(). -* -* CONTEXT: -* Grabs and releases bdev_lock. -*/ -static void bd_finish_claiming (struct block_device *bdev, -struct block_device *whole,void *holder) -{ -spin_lock (&bdev_lock); -BUG_ON (!bd_may_claim (bdev, whole, holder)); -__bd_claim (bdev, whole, holder); -__bd_abort_claiming (whole, holder);/* not actually an abort */ -} - -static void bd_release (struct block_device *bdev) -{ -spin_lock (&bdev_lock); -if (!--bdev->bd_contains->bd_holders) - bdev->bd_contains->bd_holder =NULL ; -if (!--bdev->bd_holders) - bdev->bd_holder =NULL ; -spin_unlock (&bdev_lock); -} -#ifdef CONFIG_SYSFS static int add_symlink (struct kobject *from,struct kobject *to) {
@@ -1223,10 +1150,30 @@ int blkdev_get(struct block_device *bdev, fmode_t mode, void *holder) res =__blkdev_get (bdev, mode,0 );if (whole) { -if (res ==0 ) -bd_finish_claiming (bdev, whole, holder); -else -bd_abort_claiming (whole, holder); +/* finish claiming */ +spin_lock (&bdev_lock); + +if (res ==0 ) { +BUG_ON (!bd_may_claim (bdev, whole, holder)); +/* +* Note that for a whole device bd_holders +* will be incremented twice, and bd_holder +* will be set to bd_may_claim before being +* set to holder +*/ + whole->bd_holders++; + whole->bd_holder = bd_may_claim; + bdev->bd_holders++; + bdev->bd_holder = holder; + } + +/* tell others that we're done */ +BUG_ON (whole->bd_claiming != holder); + whole->bd_claiming =NULL ; +wake_up_bit (&whole->bd_claiming,0 ); + +spin_unlock (&bdev_lock); +bdput (whole); }return res;
@@ -1272,6 +1219,7 @@ static int __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part) bdev->bd_part_count--;if (!--bdev->bd_openers) { +WARN_ON_ONCE (bdev->bd_holders);sync_blockdev (bdev);kill_bdev (bdev); }
@@ -1303,10 +1251,31 @@ static int __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part)int blkdev_put (struct block_device *bdev,fmode_t mode) {if (mode &FMODE_EXCL ) { +bool bdev_free; + +/* +* Release a claim on the device. The holder fields +* are protected with bdev_lock. bd_mutex is to +* synchronize disk_holder unlinking. +*/ mutex_lock (&bdev->bd_mutex); -bd_release (bdev); -if (!bdev->bd_holders) +spin_lock (&bdev_lock); + +WARN_ON_ONCE (--bdev->bd_holders <0 ); +WARN_ON_ONCE (--bdev->bd_contains->bd_holders <0 ); + +/* bd_contains might point to self, check in a separate step */ +if ((bdev_free = !bdev->bd_holders)) + bdev->bd_holder =NULL ; +if (!bdev->bd_contains->bd_holders) + bdev->bd_contains->bd_holder =NULL ; + +spin_unlock (&bdev_lock); + +/* if this was the last claim, holder link should go too */ +if (bdev_free)bd_unlink_disk_holder (bdev); +mutex_unlock (&bdev->bd_mutex); }return __blkdev_put (bdev, mode,0 );
Signature · 1 line
1.7.1
PATCH 5/5 block: reorganize claim/release implementation
In reply to Tejun HeoWith claim/release rolled into blkdev_get/put(), there's no reason to keep bd_abort/finish_claim(), __bd_claim() and bd_release() as separate functions. It only makes the code difficult to follow. Collapse them into blkdev_get/put(). This will ease future changes around claim/release.
--- fs/block_dev.c | 127 +++++++++++++++++++++----------------------------------- 1 files changed, 48 insertions(+), 79 deletions(-)
fs/block_dev.c +48 -79
@@ -772,79 +772,6 @@ static struct block_device *bd_start_claiming(struct block_device *bdev, } } -/* releases bdev_lock */ -static void __bd_abort_claiming (struct block_device *whole,void *holder) -{ -BUG_ON (whole->bd_claiming != holder); - whole->bd_claiming =NULL ; -wake_up_bit (&whole->bd_claiming,0 ); - -spin_unlock (&bdev_lock); -bdput (whole); -} - -/** -* bd_abort_claiming - abort claiming a block device -* @whole: whole block device returned by bd_start_claiming() -* @holder: holder trying to claim @bdev -* -* Abort a claiming block started by bd_start_claiming(). Note that -* @whole is not the block device to be claimed but the whole device -* returned by bd_start_claiming(). -* -* CONTEXT: -* Grabs and releases bdev_lock. -*/ -static void bd_abort_claiming (struct block_device *whole,void *holder) -{ -spin_lock (&bdev_lock); -__bd_abort_claiming (whole, holder);/* releases bdev_lock */ -} - -/* increment holders when we have a legitimate claim. requires bdev_lock */ -static void __bd_claim (struct block_device *bdev,struct block_device *whole, -void *holder) -{ -/* note that for a whole device bd_holders -* will be incremented twice, and bd_holder will -* be set to bd_may_claim before being set to holder -*/ - whole->bd_holders++; - whole->bd_holder = bd_may_claim; - bdev->bd_holders++; - bdev->bd_holder = holder; -} - -/** -* bd_finish_claiming - finish claiming a block device -* @bdev: block device of interest (passed to bd_start_claiming()) -* @whole: whole block device returned by bd_start_claiming() -* @holder: holder trying to claim @bdev -* -* Finish a claiming block started by bd_start_claiming(). -* -* CONTEXT: -* Grabs and releases bdev_lock. -*/ -static void bd_finish_claiming (struct block_device *bdev, -struct block_device *whole,void *holder) -{ -spin_lock (&bdev_lock); -BUG_ON (!bd_may_claim (bdev, whole, holder)); -__bd_claim (bdev, whole, holder); -__bd_abort_claiming (whole, holder);/* not actually an abort */ -} - -static void bd_release (struct block_device *bdev) -{ -spin_lock (&bdev_lock); -if (!--bdev->bd_contains->bd_holders) - bdev->bd_contains->bd_holder =NULL ; -if (!--bdev->bd_holders) - bdev->bd_holder =NULL ; -spin_unlock (&bdev_lock); -} -#ifdef CONFIG_SYSFS static int add_symlink (struct kobject *from,struct kobject *to) {
@@ -1223,10 +1150,30 @@ int blkdev_get(struct block_device *bdev, fmode_t mode, void *holder) res =__blkdev_get (bdev, mode,0 );if (whole) { -if (res ==0 ) -bd_finish_claiming (bdev, whole, holder); -else -bd_abort_claiming (whole, holder); +/* finish claiming */ +spin_lock (&bdev_lock); + +if (res ==0 ) { +BUG_ON (!bd_may_claim (bdev, whole, holder)); +/* +* Note that for a whole device bd_holders +* will be incremented twice, and bd_holder +* will be set to bd_may_claim before being +* set to holder +*/ + whole->bd_holders++; + whole->bd_holder = bd_may_claim; + bdev->bd_holders++; + bdev->bd_holder = holder; + } + +/* tell others that we're done */ +BUG_ON (whole->bd_claiming != holder); + whole->bd_claiming =NULL ; +wake_up_bit (&whole->bd_claiming,0 ); + +spin_unlock (&bdev_lock); +bdput (whole); }return res;
@@ -1272,6 +1219,7 @@ static int __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part) bdev->bd_part_count--;if (!--bdev->bd_openers) { +WARN_ON_ONCE (bdev->bd_holders);sync_blockdev (bdev);kill_bdev (bdev); }
@@ -1303,10 +1251,31 @@ static int __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part)int blkdev_put (struct block_device *bdev,fmode_t mode) {if (mode &FMODE_EXCL ) { +bool bdev_free; + +/* +* Release a claim on the device. The holder fields +* are protected with bdev_lock. bd_mutex is to +* synchronize disk_holder unlinking. +*/ mutex_lock (&bdev->bd_mutex); -bd_release (bdev); -if (!bdev->bd_holders) +spin_lock (&bdev_lock); + +WARN_ON_ONCE (--bdev->bd_holders <0 ); +WARN_ON_ONCE (--bdev->bd_contains->bd_holders <0 ); + +/* bd_contains might point to self, check in a separate step */ +if ((bdev_free = !bdev->bd_holders)) + bdev->bd_holder =NULL ; +if (!bdev->bd_contains->bd_holders) + bdev->bd_contains->bd_holder =NULL ; + +spin_unlock (&bdev_lock); + +/* if this was the last claim, holder link should go too */ +if (bdev_free)bd_unlink_disk_holder (bdev); +mutex_unlock (&bdev->bd_mutex); }return __blkdev_put (bdev, mode,0 );
Signature · 1 line
1.7.1
Quoted 11 lines · On Mon, 1 Nov 2010 17:15:24 +0100 Tejun Heo <[email protected]> wrote:
bdev exclusive access handling is somewhat clumsy. The primary interface is
bd_claim()andbd_release()but there also areopen_bdev_exclusive(),close_bdev_exclusive()andbd_claim_by_disk()andbd_release_from_disk().Gaining exclusive access as a separate step from open itself also has the inherent problem that the block layer doesn't know whether the current open attempt is for an exclusive access or not. The action of open itself may affect the existing exclusive access but there's no way to prevent it.
Quoted 4 lines
This patchset simplifies the claim/release handling by folding it into blkdev_get/put() and making others simple wrappers around them. This simplifies code and removes strange corner cases like the non-atomicity of exclusive open described above.
He Tejun,
This looks like a really nice clean-up! Thanks.
Definitely
for the md parts.
Thanks,
NeilBrown
Quoted 60 lines
There are five patches in this series.
0001-mtd-fix-bdev-exclusive-open-bugs-in-block2mtd-add_de.patch 0002-btrfs-close_bdev_exclusive-should-use-the-same-flags.patch 0003-block-simplify-holder-symlink-handling.patch 0004-block-make-blkdev_get-put-handle-exclusive-access.patch 0005-block-reorganize-claim-release-implementation.patch
0001-0002 are fixes regarding exclusive bdev opens. 0003 simplifies holder/slave symlink handling. 0004 folds bdev claim/release into blkdev_get/put(). 0005 reorganizes implementation a bit.
Cleaning up claim/release handling enables implementation of in-kernel disk event polling which be posted soon. Although this patchset touches various files including drivers and filesystems, the changes there are mostly trivial and I think it would be best to route these through the block tree.
This patchset is on top of 2.6.37-rc1 and available in the following git tree.
git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git
cleanup-bd_claimThis patchset reduces about 400 lines of code.
Thanks.
block/ioctl.c | 5 drivers/block/drbd/drbd_int.h | 2 drivers/block/drbd/drbd_main.c | 7 drivers/block/drbd/drbd_nl.c | 103 ++----- drivers/block/pktcdvd.c | 22 - drivers/char/raw.c | 14 drivers/md/dm-table.c | 20 - drivers/md/md.c | 16 - drivers/mtd/devices/block2mtd.c | 10 drivers/s390/block/dasd_genhd.c | 2 fs/block_dev.c | 576 +++++++++------------------------------- fs/btrfs/volumes.c | 14 fs/ext3/super.c | 12 fs/ext4/super.c | 12 fs/gfs2/ops_fstype.c | 4 fs/jfs/jfs_logmgr.c | 17 - fs/logfs/dev_bdev.c | 4 fs/nilfs2/super.c | 4 fs/ocfs2/cluster/heartbeat.c | 2 fs/partitions/check.c | 2 fs/reiserfs/journal.c | 17 - fs/super.c | 14 fs/xfs/linux-2.6/xfs_super.c | 2 include/linux/fs.h | 22 - kernel/power/swap.c | 5 mm/swapfile.c | 7 26 files changed, 260insertions(+), 655 deletions(-)
--
tejun
Am Montag, 1. November 2010, um 17:15:24 schrieb Tejun Heo:
Quoted 4 lines
bdev exclusive access handling is somewhat clumsy. The primary interface is
bd_claim()andbd_release()but there also areopen_bdev_exclusive(),close_bdev_exclusive()andbd_claim_by_disk()andbd_release_from_disk().
[...]
Quoted 3 lines
drivers/block/drbd/drbd_int.h | 2 drivers/block/drbd/drbd_main.c | 7 drivers/block/drbd/drbd_nl.c | 103 ++-----
[...]
Hi Tejun,
...for the DRBD part of the patch.
Best,
Phil
[PATCH 6/5] block: check bdev_read_only() from blkdev_get()
In reply to Tejun Heobdev read-only status can be queried using bdev_read_only() and may change while the device is being opened. Enforce it by checking it from blkdev_get() after open succeeds.
This makes bdev_read_only() check in open_bdev_exclusive() and fsg_lun_open() unnecessary. Drop them.
--- drivers/usb/gadget/storage_common.c | 7 ++----- fs/block_dev.c | 11 ++++++----- 2 files changed, 8 insertions(+), 10 deletions(-)
drivers/usb/gadget/storage_common.c +2 -5
@@ -543,7 +543,7 @@ static int fsg_lun_open(struct fsg_lun *curlun, const char *filename) ro = curlun->initially_ro;if (!ro) { filp =filp_open (filename,O_RDWR |O_LARGEFILE ,0 ); -if (-EROFS ==PTR_ERR (filp)) +if (PTR_ERR (filp) == -EROFS ||PTR_ERR (filp) == -EACCES ) ro =1 ; }if (ro)
@@ -558,10 +558,7 @@ static int fsg_lun_open(struct fsg_lun *curlun, const char *filename)if (filp->f_path.dentry) inode = filp->f_path.dentry->d_inode; -if (inode &&S_ISBLK (inode->i_mode)) { -if (bdev_read_only (inode->i_bdev)) - ro =1 ; - }else if (!inode || !S_ISREG (inode->i_mode)) { +if (!inode || (!S_ISREG (inode->i_mode) && !S_ISBLK (inode->i_mode))) {LINFO (curlun,"invalid file type: %s\n" , filename); goto out; }
fs/block_dev.c +6 -5
@@ -1149,6 +1149,12 @@ int blkdev_get(struct block_device *bdev, fmode_t mode, void *holder) res =__blkdev_get (bdev, mode,0 ); +/* __blkdev_get() may alter read only status, check it afterwards */ +if (!res && (mode &FMODE_WRITE ) &&bdev_read_only (bdev)) { +__blkdev_put (bdev, mode,0 ); + res = -EACCES ; + } +if (whole) {/* finish claiming */ spin_lock (&bdev_lock);
@@ -1453,11 +1459,6 @@ struct block_device *open_bdev_exclusive(const char *path, fmode_t mode, void *hif (error)return ERR_PTR (error); -if ((mode &FMODE_WRITE ) &&bdev_read_only (bdev)) { -blkdev_put (bdev, mode); -return ERR_PTR (-EACCES ); - } -return bdev; }
Signature · 1 line
1.7.1
[PATCH 6/5] block: check bdev_read_only() from blkdev_get()
In reply to Tejun Heobdev read-only status can be queried using bdev_read_only() and may change while the device is being opened. Enforce it by checking it from blkdev_get() after open succeeds.
This makes bdev_read_only() check in open_bdev_exclusive() and fsg_lun_open() unnecessary. Drop them.
--- drivers/usb/gadget/storage_common.c | 7 ++----- fs/block_dev.c | 11 ++++++----- 2 files changed, 8 insertions(+), 10 deletions(-)
drivers/usb/gadget/storage_common.c +2 -5
@@ -543,7 +543,7 @@ static int fsg_lun_open(struct fsg_lun *curlun, const char *filename) ro = curlun->initially_ro;if (!ro) { filp =filp_open (filename,O_RDWR |O_LARGEFILE ,0 ); -if (-EROFS ==PTR_ERR (filp)) +if (PTR_ERR (filp) == -EROFS ||PTR_ERR (filp) == -EACCES ) ro =1 ; }if (ro)
@@ -558,10 +558,7 @@ static int fsg_lun_open(struct fsg_lun *curlun, const char *filename)if (filp->f_path.dentry) inode = filp->f_path.dentry->d_inode; -if (inode &&S_ISBLK (inode->i_mode)) { -if (bdev_read_only (inode->i_bdev)) - ro =1 ; - }else if (!inode || !S_ISREG (inode->i_mode)) { +if (!inode || (!S_ISREG (inode->i_mode) && !S_ISBLK (inode->i_mode))) {LINFO (curlun,"invalid file type: %s\n" , filename); goto out; }
fs/block_dev.c +6 -5
@@ -1149,6 +1149,12 @@ int blkdev_get(struct block_device *bdev, fmode_t mode, void *holder) res =__blkdev_get (bdev, mode,0 ); +/* __blkdev_get() may alter read only status, check it afterwards */ +if (!res && (mode &FMODE_WRITE ) &&bdev_read_only (bdev)) { +__blkdev_put (bdev, mode,0 ); + res = -EACCES ; + } +if (whole) {/* finish claiming */ spin_lock (&bdev_lock);
@@ -1453,11 +1459,6 @@ struct block_device *open_bdev_exclusive(const char *path, fmode_t mode, void *hif (error)return ERR_PTR (error); -if ((mode &FMODE_WRITE ) &&bdev_read_only (bdev)) { -blkdev_put (bdev, mode); -return ERR_PTR (-EACCES ); - } -return bdev; }
Signature · 1 line
1.7.1
[PATCH 7/5] block: clean up blkdev_get() wrappers and their users
In reply to Tejun HeoAfter 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.
--- drivers/block/drbd/drbd_nl.c | 12 ++-- drivers/md/dm-table.c | 2 +- drivers/md/md.c | 4 +- drivers/mtd/devices/block2mtd.c | 5 +- fs/block_dev.c | 139 ++++++++++++++++++++++++++------------- fs/btrfs/volumes.c | 24 ++++--- fs/btrfs/volumes.h | 2 +- fs/ext3/super.c | 2 +- fs/ext4/super.c | 2 +- fs/gfs2/ops_fstype.c | 8 +- fs/jfs/jfs_logmgr.c | 4 +- fs/logfs/dev_bdev.c | 3 +- fs/nilfs2/super.c | 8 +- fs/reiserfs/journal.c | 6 +- fs/super.c | 9 ++- fs/xfs/linux-2.6/xfs_super.c | 3 +- include/linux/fs.h | 7 +- kernel/power/swap.c | 4 +- 18 files changed, 150 insertions(+), 94 deletions(-)
drivers/block/drbd/drbd_nl.c +6 -6
@@ -902,8 +902,8 @@ static int drbd_nl_disk_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp } } - bdev =open_bdev_exclusive (nbc->dc.backing_dev, -FMODE_READ |FMODE_WRITE , mdev); + bdev =blkdev_get_by_path (nbc->dc.backing_dev, +FMODE_READ |FMODE_WRITE |FMODE_EXCL , mdev);if (IS_ERR (bdev)) {dev_err (DEV ,"open(\"%s\") failed with %ld\n" , nbc->dc.backing_dev,PTR_ERR (bdev));
@@ -920,10 +920,10 @@ static int drbd_nl_disk_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp* should check it for you already; but if you don't, or * someone fooled it, we need to double check here) */ - bdev =open_bdev_exclusive (nbc->dc.meta_dev, -FMODE_READ |FMODE_WRITE , - (nbc->dc.meta_dev_idx <0 ) ? - (void *)mdev : (void *)drbd_m_holder); + bdev =blkdev_get_by_path (nbc->dc.meta_dev, +FMODE_READ |FMODE_WRITE |FMODE_EXCL , + (nbc->dc.meta_dev_idx <0 ) ? + (void *)mdev : (void *)drbd_m_holder);if (IS_ERR (bdev)) {dev_err (DEV ,"open(\"%s\") failed with %ld\n" , nbc->dc.meta_dev,PTR_ERR (bdev));
drivers/md/dm-table.c +1 -1
@@ -325,7 +325,7 @@ static int open_dev(struct dm_dev_internal *d, dev_t dev,BUG_ON (d->dm_dev.bdev); - bdev =open_by_devnum (dev, d->dm_dev.mode |FMODE_EXCL , _claim_ptr); + bdev =blkdev_get_by_dev (dev, d->dm_dev.mode |FMODE_EXCL , _claim_ptr);if (IS_ERR (bdev))return PTR_ERR (bdev);
drivers/md/md.c +2 -2
@@ -1934,8 +1934,8 @@ static int lock_rdev(mdk_rdev_t *rdev, dev_t dev, int shared)struct block_device *bdev;char b[BDEVNAME_SIZE ]; - bdev =open_by_devnum (dev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , - shared ? (mdk_rdev_t *)lock_rdev : rdev); + bdev =blkdev_get_by_dev (dev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , + shared ? (mdk_rdev_t *)lock_rdev : rdev);if (IS_ERR (bdev)) {printk (KERN_ERR "md: could not open %s.\n" ,__bdevname (dev, b));
drivers/mtd/devices/block2mtd.c +3 -2
@@ -246,7 +246,8 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)return NULL ;/* Get a handle on the device */ - bdev =open_bdev_exclusive (devname,FMODE_READ |FMODE_WRITE , dev); + bdev =blkdev_get_by_path (devname, +FMODE_READ |FMODE_WRITE |FMODE_EXCL , dev);#ifndef MODULE if (IS_ERR (bdev)) {
@@ -255,7 +256,7 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)dev_t devt =name_to_dev_t (devname);if (devt) - bdev =open_by_devnum (devt, + bdev =blkdev_get_by_dev (devt, FMODE_READ|FMODE_WRITE|FMODE_EXCL, dev); }#endif
fs/block_dev.c +93 -46
163 lines not on this page · raw message
fs/btrfs/volumes.c +14 -10
@@ -489,7 +489,7 @@ again:continue ;if (device->bdev) { -blkdev_put (device->bdev, device->mode |FMODE_EXCL ); +blkdev_put (device->bdev, device->mode); device->bdev =NULL ; fs_devices->open_devices--; }
@@ -523,7 +523,7 @@ static int __btrfs_close_devices(struct btrfs_fs_devices *fs_devices)list_for_each_entry (device, &fs_devices->devices, dev_list) {if (device->bdev) { -blkdev_put (device->bdev, device->mode |FMODE_EXCL ); +blkdev_put (device->bdev, device->mode); fs_devices->open_devices--; }if (device->writeable) {
@@ -580,13 +580,15 @@ static int __btrfs_open_devices(struct btrfs_fs_devices *fs_devices,int seeding =1 ;int ret =0 ; + flags |=FMODE_EXCL ; +list_for_each_entry (device, head, dev_list) {if (device->bdev)continue ;if (!device->name)continue ; - bdev =open_bdev_exclusive (device->name, flags, holder); + bdev =blkdev_get_by_path (device->name, flags, holder);if (IS_ERR (bdev)) {printk (KERN_INFO "open %s failed\n" , device->name); goto error;
@@ -638,7 +640,7 @@ static int __btrfs_open_devices(struct btrfs_fs_devices *fs_devices, error_brelse:brelse (bh); error_close: -blkdev_put (bdev, flags |FMODE_EXCL ); +blkdev_put (bdev, flags); error:continue ; }
@@ -684,7 +686,8 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder,mutex_lock (&uuid_mutex); - bdev =open_bdev_exclusive (path, flags, holder); + flags |=FMODE_EXCL ; + bdev =blkdev_get_by_path (path, flags, holder);if (IS_ERR (bdev)) { ret =PTR_ERR (bdev);
@@ -716,7 +719,7 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder,brelse (bh); error_close: -blkdev_put (bdev, flags |FMODE_EXCL ); +blkdev_put (bdev, flags); error:mutex_unlock (&uuid_mutex);return ret;
@@ -1179,8 +1182,8 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path) goto out; } }else { - bdev =open_bdev_exclusive (device_path,FMODE_READ , - root->fs_info->bdev_holder); + bdev =blkdev_get_by_path (device_path,FMODE_READ |FMODE_EXCL , + root->fs_info->bdev_holder);if (IS_ERR (bdev)) { ret =PTR_ERR (bdev); goto out;
@@ -1244,7 +1247,7 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path) root->fs_info->fs_devices->latest_bdev = next_device->bdev;if (device->bdev) { -blkdev_put (device->bdev, device->mode |FMODE_EXCL ); +blkdev_put (device->bdev, device->mode); device->bdev =NULL ; device->fs_devices->open_devices--; }
@@ -1439,7 +1442,8 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path)if ((sb->s_flags &MS_RDONLY ) && !root->fs_info->fs_devices->seeding)return -EINVAL ; - bdev =open_bdev_exclusive (device_path,0 , root->fs_info->bdev_holder); + bdev =blkdev_get_by_path (device_path,FMODE_EXCL , + root->fs_info->bdev_holder);if (IS_ERR (bdev))return PTR_ERR (bdev);
fs/btrfs/volumes.h +1 -1
@@ -49,7 +49,7 @@ struct btrfs_device {struct block_device *bdev; -/* the mode sent to open_bdev_exclusive */ +/* the mode sent to blkdev_get */ fmode_t mode;char *name;
fs/ext3/super.c +1 -1
@@ -347,7 +347,7 @@ static struct block_device *ext3_blkdev_get(dev_t dev, struct super_block *sb)struct block_device *bdev;char b[BDEVNAME_SIZE ]; - bdev =open_by_devnum (dev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , sb); + bdev =blkdev_get_by_dev (dev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , sb);if (IS_ERR (bdev)) goto fail;return bdev;
fs/ext4/super.c +1 -1
@@ -647,7 +647,7 @@ static struct block_device *ext4_blkdev_get(dev_t dev, struct super_block *sb)struct block_device *bdev;char b[BDEVNAME_SIZE ]; - bdev =open_by_devnum (dev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , sb); + bdev =blkdev_get_by_dev (dev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , sb);if (IS_ERR (bdev)) goto fail;return bdev;
fs/gfs2/ops_fstype.c +4 -4
@@ -1268,7 +1268,7 @@ static struct dentry *gfs2_mount(struct file_system_type *fs_type, int flags, {struct block_device *bdev;struct super_block *s; -fmode_t mode =FMODE_READ ; +fmode_t mode =FMODE_READ |FMODE_EXCL ;int error;struct gfs2_args args;struct gfs2_sbd *sdp;
@@ -1276,7 +1276,7 @@ static struct dentry *gfs2_mount(struct file_system_type *fs_type, int flags,if (!(flags &MS_RDONLY )) mode |=FMODE_WRITE ; - bdev =open_bdev_exclusive (dev_name, mode, fs_type); + bdev =blkdev_get_by_path (dev_name, mode, fs_type);if (IS_ERR (bdev))return ERR_CAST (bdev);
@@ -1298,7 +1298,7 @@ static struct dentry *gfs2_mount(struct file_system_type *fs_type, int flags, goto error_bdev;if (s->s_root) -blkdev_put (bdev, mode |FMODE_EXCL ); +blkdev_put (bdev, mode);memset (&args,0 ,sizeof (args)); args.ar_quota =GFS2_QUOTA_DEFAULT ;
@@ -1342,7 +1342,7 @@ error_super:deactivate_locked_super (s);return ERR_PTR (error); error_bdev: -blkdev_put (bdev, mode |FMODE_EXCL ); +blkdev_put (bdev, mode);return ERR_PTR (error); }
fs/jfs/jfs_logmgr.c +2 -2
@@ -1120,8 +1120,8 @@ int lmLogOpen(struct super_block *sb)* file systems to log may have n-to-1 relationship; */ - bdev =open_by_devnum (sbi->logdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , - log); + bdev =blkdev_get_by_dev (sbi->logdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , + log);if (IS_ERR (bdev)) { rc = -PTR_ERR (bdev); goto free;
fs/logfs/dev_bdev.c +2 -1
@@ -325,7 +325,8 @@ int logfs_get_sb_bdev(struct logfs_super *p, struct file_system_type *type, {struct block_device *bdev; - bdev =open_bdev_exclusive (devname,FMODE_READ |FMODE_WRITE , type); + bdev =blkdev_get_by_path (devname,FMODE_READ |FMODE_WRITE |FMODE_EXCL , + type);if (IS_ERR (bdev))return PTR_ERR (bdev);
fs/nilfs2/super.c +4 -4
@@ -1147,14 +1147,14 @@ nilfs_mount(struct file_system_type *fs_type, int flags, {struct nilfs_super_data sd;struct super_block *s; -fmode_t mode =FMODE_READ ; +fmode_t mode =FMODE_READ |FMODE_EXCL ;struct dentry *root_dentry;int err, s_new = false;if (!(flags &MS_RDONLY )) mode |=FMODE_WRITE ; - sd.bdev =open_bdev_exclusive (dev_name, mode, fs_type); + sd.bdev =blkdev_get_by_path (dev_name, mode, fs_type);if (IS_ERR (sd.bdev))return ERR_CAST (sd.bdev);
@@ -1233,7 +1233,7 @@ nilfs_mount(struct file_system_type *fs_type, int flags, }if (!s_new) -blkdev_put (sd.bdev, mode |FMODE_EXCL ); +blkdev_put (sd.bdev, mode);return root_dentry;
@@ -1242,7 +1242,7 @@ nilfs_mount(struct file_system_type *fs_type, int flags, failed:if (!s_new) -blkdev_put (sd.bdev, mode |FMODE_EXCL ); +blkdev_put (sd.bdev, mode);return ERR_PTR (err); }
fs/reiserfs/journal.c +3 -3
@@ -2585,7 +2585,8 @@ static int journal_init_dev(struct super_block *super,if ((!jdev_name || !jdev_name[0 ])) {if (jdev == super->s_dev) blkdev_mode &= ~FMODE_EXCL ; - journal->j_dev_bd =open_by_devnum (jdev, blkdev_mode, journal); + journal->j_dev_bd =blkdev_get_by_dev (jdev, blkdev_mode, + journal); journal->j_dev_mode = blkdev_mode;if (IS_ERR (journal->j_dev_bd)) { result =PTR_ERR (journal->j_dev_bd);
@@ -2601,8 +2602,7 @@ static int journal_init_dev(struct super_block *super, } journal->j_dev_mode = blkdev_mode; - journal->j_dev_bd =open_bdev_exclusive (jdev_name, - blkdev_mode, journal); + journal->j_dev_bd =blkdev_get_by_path (jdev_name, blkdev_mode, journal);if (IS_ERR (journal->j_dev_bd)) { result =PTR_ERR (journal->j_dev_bd); journal->j_dev_bd =NULL ;
fs/super.c +5 -4
@@ -766,13 +766,13 @@ struct dentry *mount_bdev(struct file_system_type *fs_type, {struct block_device *bdev;struct super_block *s; -fmode_t mode =FMODE_READ ; +fmode_t mode =FMODE_READ |FMODE_EXCL ;int error =0 ;if (!(flags &MS_RDONLY )) mode |=FMODE_WRITE ; - bdev =open_bdev_exclusive (dev_name, mode, fs_type); + bdev =blkdev_get_by_path (dev_name, mode, fs_type);if (IS_ERR (bdev))return ERR_CAST (bdev);
@@ -807,7 +807,7 @@ struct dentry *mount_bdev(struct file_system_type *fs_type,* holding an active reference. */ up_write (&s->s_umount); -blkdev_put (bdev, mode |FMODE_EXCL ); +blkdev_put (bdev, mode);down_write (&s->s_umount); }else {char b[BDEVNAME_SIZE ];
@@ -831,7 +831,7 @@ struct dentry *mount_bdev(struct file_system_type *fs_type, error_s: error =PTR_ERR (s); error_bdev: -blkdev_put (bdev, mode |FMODE_EXCL ); +blkdev_put (bdev, mode); error:return ERR_PTR (error); }
@@ -862,6 +862,7 @@ void kill_block_super(struct super_block *sb) bdev->bd_super =NULL ;generic_shutdown_super (sb);sync_blockdev (bdev); +WARN_ON_ONCE (!(mode &FMODE_EXCL ));blkdev_put (bdev, mode |FMODE_EXCL ); }
fs/xfs/linux-2.6/xfs_super.c +2 -1
@@ -609,7 +609,8 @@ xfs_blkdev_get( {int error =0 ; - *bdevp =open_bdev_exclusive (name,FMODE_READ |FMODE_WRITE , mp); + *bdevp =blkdev_get_by_path (name,FMODE_READ |FMODE_WRITE |FMODE_EXCL , + mp);if (IS_ERR (*bdevp)) { error =PTR_ERR (*bdevp);printk ("XFS: Invalid device [%s], error=%d\n" , name, error);
include/linux/fs.h +4 -3
@@ -2006,8 +2006,6 @@ extern struct block_device *bdgrab(struct block_device *bdev);extern void bd_set_size (struct block_device *,loff_t size);extern void bd_forget (struct inode *inode);extern void bdput (struct block_device *); -extern struct block_device *open_by_devnum (dev_t dev,fmode_t mode, -void *holder);extern void invalidate_bdev (struct block_device *);extern int sync_blockdev (struct block_device *bdev);extern struct super_block *freeze_bdev (struct block_device *);
@@ -2039,6 +2037,10 @@ extern int ioctl_by_bdev(struct block_device *, unsigned, unsigned long);extern int blkdev_ioctl (struct block_device *,fmode_t ,unsigned ,unsigned long );extern long compat_blkdev_ioctl (struct file *,unsigned ,unsigned long );extern int blkdev_get (struct block_device *bdev,fmode_t mode,void *holder); +extern struct block_device *blkdev_get_by_path (const char *path,fmode_t mode, +void *holder); +extern struct block_device *blkdev_get_by_dev (dev_t dev,fmode_t mode, +void *holder);extern int blkdev_put (struct block_device *bdev,fmode_t mode);#ifdef CONFIG_SYSFS extern int bd_link_disk_holder (struct block_device *bdev,struct gendisk *disk);
@@ -2083,7 +2085,6 @@ static inline void unregister_chrdev(unsigned int major, const char *name)extern const char *__bdevname (dev_t ,char *buffer);extern const char *bdevname (struct block_device *bdev,char *buffer);extern struct block_device *lookup_bdev (const char *); -extern struct block_device *open_bdev_exclusive (const char *,fmode_t ,void *);extern void blkdev_show (struct seq_file *,off_t );#else
kernel/power/swap.c +2 -2
@@ -907,8 +907,8 @@ int swsusp_check(void) {int error; - hib_resume_bdev =open_by_devnum (swsusp_resume_device, -FMODE_READ ,NULL ); + hib_resume_bdev =blkdev_get_by_dev (swsusp_resume_device, +FMODE_READ ,NULL );if (!IS_ERR (hib_resume_bdev)) {set_blocksize (hib_resume_bdev,PAGE_SIZE );clear_page (swsusp_header);
Signature · 1 line
1.7.1
Steven Whitehouse
Acked-byRe: [PATCH 7/5] block: clean up blkdev_get() wrappers and their users
Hi,
Quoted 24 lines · Tejun Heo
After recent
blkdev_get()modifications,open_by_devnum()andopen_bdev_exclusive()are simple wrappers aroundblkdev_get(). Replace them withblkdev_get_by_dev()andblkdev_get_by_path().
blkdev_get_by_dev()is identical toopen_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_EXCLinbtrfs_device->mode, so there's no reason to OR it explicitly onblkdev_put().* gfs2, nilfs2 and the generic
mount_bdev()now setFMODE_EXCLinsb->s_mode.* With the above changes,
sb->s_modenow always should containFMODE_EXCL.WARN_ON_ONCE()added tokill_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.
Quoted 12 lines
Signed-off-by Tejun Heo <[email protected]>Cc Philipp Reisner <[email protected]>Cc Neil Brown <[email protected]>Cc Mike Snitzer <[email protected]>Cc Joern Engel <[email protected]>Cc Chris Mason <[email protected]>Cc Jan Kara <[email protected]>Cc "Theodore Ts'o" <[email protected]>Cc KONISHI Ryusuke <[email protected]>Cc Alexander Viro <[email protected]>
Steve.
[PATCH 7/5] block: clean up blkdev_get() wrappers and their users
In reply to Tejun HeoAfter 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.
--- drivers/block/drbd/drbd_nl.c | 12 ++-- drivers/md/dm-table.c | 2 +- drivers/md/md.c | 4 +- drivers/mtd/devices/block2mtd.c | 5 +- fs/block_dev.c | 139 ++++++++++++++++++++++++++------------- fs/btrfs/volumes.c | 24 ++++--- fs/btrfs/volumes.h | 2 +- fs/ext3/super.c | 2 +- fs/ext4/super.c | 2 +- fs/gfs2/ops_fstype.c | 8 +- fs/jfs/jfs_logmgr.c | 4 +- fs/logfs/dev_bdev.c | 3 +- fs/nilfs2/super.c | 8 +- fs/reiserfs/journal.c | 6 +- fs/super.c | 9 ++- fs/xfs/linux-2.6/xfs_super.c | 3 +- include/linux/fs.h | 7 +- kernel/power/swap.c | 4 +- 18 files changed, 150 insertions(+), 94 deletions(-)
drivers/block/drbd/drbd_nl.c +6 -6
@@ -902,8 +902,8 @@ static int drbd_nl_disk_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp } } - bdev =open_bdev_exclusive (nbc->dc.backing_dev, -FMODE_READ |FMODE_WRITE , mdev); + bdev =blkdev_get_by_path (nbc->dc.backing_dev, +FMODE_READ |FMODE_WRITE |FMODE_EXCL , mdev);if (IS_ERR (bdev)) {dev_err (DEV ,"open(\"%s\") failed with %ld\n" , nbc->dc.backing_dev,PTR_ERR (bdev));
@@ -920,10 +920,10 @@ static int drbd_nl_disk_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp* should check it for you already; but if you don't, or * someone fooled it, we need to double check here) */ - bdev =open_bdev_exclusive (nbc->dc.meta_dev, -FMODE_READ |FMODE_WRITE , - (nbc->dc.meta_dev_idx <0 ) ? - (void *)mdev : (void *)drbd_m_holder); + bdev =blkdev_get_by_path (nbc->dc.meta_dev, +FMODE_READ |FMODE_WRITE |FMODE_EXCL , + (nbc->dc.meta_dev_idx <0 ) ? + (void *)mdev : (void *)drbd_m_holder);if (IS_ERR (bdev)) {dev_err (DEV ,"open(\"%s\") failed with %ld\n" , nbc->dc.meta_dev,PTR_ERR (bdev));
drivers/md/dm-table.c +1 -1
@@ -325,7 +325,7 @@ static int open_dev(struct dm_dev_internal *d, dev_t dev,BUG_ON (d->dm_dev.bdev); - bdev =open_by_devnum (dev, d->dm_dev.mode |FMODE_EXCL , _claim_ptr); + bdev =blkdev_get_by_dev (dev, d->dm_dev.mode |FMODE_EXCL , _claim_ptr);if (IS_ERR (bdev))return PTR_ERR (bdev);
drivers/md/md.c +2 -2
@@ -1934,8 +1934,8 @@ static int lock_rdev(mdk_rdev_t *rdev, dev_t dev, int shared)struct block_device *bdev;char b[BDEVNAME_SIZE ]; - bdev =open_by_devnum (dev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , - shared ? (mdk_rdev_t *)lock_rdev : rdev); + bdev =blkdev_get_by_dev (dev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , + shared ? (mdk_rdev_t *)lock_rdev : rdev);if (IS_ERR (bdev)) {printk (KERN_ERR "md: could not open %s.\n" ,__bdevname (dev, b));
drivers/mtd/devices/block2mtd.c +3 -2
@@ -246,7 +246,8 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)return NULL ;/* Get a handle on the device */ - bdev =open_bdev_exclusive (devname,FMODE_READ |FMODE_WRITE , dev); + bdev =blkdev_get_by_path (devname, +FMODE_READ |FMODE_WRITE |FMODE_EXCL , dev);#ifndef MODULE if (IS_ERR (bdev)) {
@@ -255,7 +256,7 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)dev_t devt =name_to_dev_t (devname);if (devt) - bdev =open_by_devnum (devt, + bdev =blkdev_get_by_dev (devt, FMODE_READ|FMODE_WRITE|FMODE_EXCL, dev); }#endif
fs/block_dev.c +93 -46
163 lines not on this page · raw message
fs/btrfs/volumes.c +14 -10
@@ -489,7 +489,7 @@ again:continue ;if (device->bdev) { -blkdev_put (device->bdev, device->mode |FMODE_EXCL ); +blkdev_put (device->bdev, device->mode); device->bdev =NULL ; fs_devices->open_devices--; }
@@ -523,7 +523,7 @@ static int __btrfs_close_devices(struct btrfs_fs_devices *fs_devices)list_for_each_entry (device, &fs_devices->devices, dev_list) {if (device->bdev) { -blkdev_put (device->bdev, device->mode |FMODE_EXCL ); +blkdev_put (device->bdev, device->mode); fs_devices->open_devices--; }if (device->writeable) {
@@ -580,13 +580,15 @@ static int __btrfs_open_devices(struct btrfs_fs_devices *fs_devices,int seeding =1 ;int ret =0 ; + flags |=FMODE_EXCL ; +list_for_each_entry (device, head, dev_list) {if (device->bdev)continue ;if (!device->name)continue ; - bdev =open_bdev_exclusive (device->name, flags, holder); + bdev =blkdev_get_by_path (device->name, flags, holder);if (IS_ERR (bdev)) {printk (KERN_INFO "open %s failed\n" , device->name); goto error;
@@ -638,7 +640,7 @@ static int __btrfs_open_devices(struct btrfs_fs_devices *fs_devices, error_brelse:brelse (bh); error_close: -blkdev_put (bdev, flags |FMODE_EXCL ); +blkdev_put (bdev, flags); error:continue ; }
@@ -684,7 +686,8 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder,mutex_lock (&uuid_mutex); - bdev =open_bdev_exclusive (path, flags, holder); + flags |=FMODE_EXCL ; + bdev =blkdev_get_by_path (path, flags, holder);if (IS_ERR (bdev)) { ret =PTR_ERR (bdev);
@@ -716,7 +719,7 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder,brelse (bh); error_close: -blkdev_put (bdev, flags |FMODE_EXCL ); +blkdev_put (bdev, flags); error:mutex_unlock (&uuid_mutex);return ret;
@@ -1179,8 +1182,8 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path) goto out; } }else { - bdev =open_bdev_exclusive (device_path,FMODE_READ , - root->fs_info->bdev_holder); + bdev =blkdev_get_by_path (device_path,FMODE_READ |FMODE_EXCL , + root->fs_info->bdev_holder);if (IS_ERR (bdev)) { ret =PTR_ERR (bdev); goto out;
@@ -1244,7 +1247,7 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path) root->fs_info->fs_devices->latest_bdev = next_device->bdev;if (device->bdev) { -blkdev_put (device->bdev, device->mode |FMODE_EXCL ); +blkdev_put (device->bdev, device->mode); device->bdev =NULL ; device->fs_devices->open_devices--; }
@@ -1439,7 +1442,8 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path)if ((sb->s_flags &MS_RDONLY ) && !root->fs_info->fs_devices->seeding)return -EINVAL ; - bdev =open_bdev_exclusive (device_path,0 , root->fs_info->bdev_holder); + bdev =blkdev_get_by_path (device_path,FMODE_EXCL , + root->fs_info->bdev_holder);if (IS_ERR (bdev))return PTR_ERR (bdev);
fs/btrfs/volumes.h +1 -1
@@ -49,7 +49,7 @@ struct btrfs_device {struct block_device *bdev; -/* the mode sent to open_bdev_exclusive */ +/* the mode sent to blkdev_get */ fmode_t mode;char *name;
fs/ext3/super.c +1 -1
@@ -347,7 +347,7 @@ static struct block_device *ext3_blkdev_get(dev_t dev, struct super_block *sb)struct block_device *bdev;char b[BDEVNAME_SIZE ]; - bdev =open_by_devnum (dev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , sb); + bdev =blkdev_get_by_dev (dev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , sb);if (IS_ERR (bdev)) goto fail;return bdev;
fs/ext4/super.c +1 -1
@@ -647,7 +647,7 @@ static struct block_device *ext4_blkdev_get(dev_t dev, struct super_block *sb)struct block_device *bdev;char b[BDEVNAME_SIZE ]; - bdev =open_by_devnum (dev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , sb); + bdev =blkdev_get_by_dev (dev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , sb);if (IS_ERR (bdev)) goto fail;return bdev;
fs/gfs2/ops_fstype.c +4 -4
@@ -1268,7 +1268,7 @@ static struct dentry *gfs2_mount(struct file_system_type *fs_type, int flags, {struct block_device *bdev;struct super_block *s; -fmode_t mode =FMODE_READ ; +fmode_t mode =FMODE_READ |FMODE_EXCL ;int error;struct gfs2_args args;struct gfs2_sbd *sdp;
@@ -1276,7 +1276,7 @@ static struct dentry *gfs2_mount(struct file_system_type *fs_type, int flags,if (!(flags &MS_RDONLY )) mode |=FMODE_WRITE ; - bdev =open_bdev_exclusive (dev_name, mode, fs_type); + bdev =blkdev_get_by_path (dev_name, mode, fs_type);if (IS_ERR (bdev))return ERR_CAST (bdev);
@@ -1298,7 +1298,7 @@ static struct dentry *gfs2_mount(struct file_system_type *fs_type, int flags, goto error_bdev;if (s->s_root) -blkdev_put (bdev, mode |FMODE_EXCL ); +blkdev_put (bdev, mode);memset (&args,0 ,sizeof (args)); args.ar_quota =GFS2_QUOTA_DEFAULT ;
@@ -1342,7 +1342,7 @@ error_super:deactivate_locked_super (s);return ERR_PTR (error); error_bdev: -blkdev_put (bdev, mode |FMODE_EXCL ); +blkdev_put (bdev, mode);return ERR_PTR (error); }
fs/jfs/jfs_logmgr.c +2 -2
@@ -1120,8 +1120,8 @@ int lmLogOpen(struct super_block *sb)* file systems to log may have n-to-1 relationship; */ - bdev =open_by_devnum (sbi->logdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , - log); + bdev =blkdev_get_by_dev (sbi->logdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , + log);if (IS_ERR (bdev)) { rc = -PTR_ERR (bdev); goto free;
fs/logfs/dev_bdev.c +2 -1
@@ -325,7 +325,8 @@ int logfs_get_sb_bdev(struct logfs_super *p, struct file_system_type *type, {struct block_device *bdev; - bdev =open_bdev_exclusive (devname,FMODE_READ |FMODE_WRITE , type); + bdev =blkdev_get_by_path (devname,FMODE_READ |FMODE_WRITE |FMODE_EXCL , + type);if (IS_ERR (bdev))return PTR_ERR (bdev);
fs/nilfs2/super.c +4 -4
@@ -1147,14 +1147,14 @@ nilfs_mount(struct file_system_type *fs_type, int flags, {struct nilfs_super_data sd;struct super_block *s; -fmode_t mode =FMODE_READ ; +fmode_t mode =FMODE_READ |FMODE_EXCL ;struct dentry *root_dentry;int err, s_new = false;if (!(flags &MS_RDONLY )) mode |=FMODE_WRITE ; - sd.bdev =open_bdev_exclusive (dev_name, mode, fs_type); + sd.bdev =blkdev_get_by_path (dev_name, mode, fs_type);if (IS_ERR (sd.bdev))return ERR_CAST (sd.bdev);
@@ -1233,7 +1233,7 @@ nilfs_mount(struct file_system_type *fs_type, int flags, }if (!s_new) -blkdev_put (sd.bdev, mode |FMODE_EXCL ); +blkdev_put (sd.bdev, mode);return root_dentry;
@@ -1242,7 +1242,7 @@ nilfs_mount(struct file_system_type *fs_type, int flags, failed:if (!s_new) -blkdev_put (sd.bdev, mode |FMODE_EXCL ); +blkdev_put (sd.bdev, mode);return ERR_PTR (err); }
fs/reiserfs/journal.c +3 -3
@@ -2585,7 +2585,8 @@ static int journal_init_dev(struct super_block *super,if ((!jdev_name || !jdev_name[0 ])) {if (jdev == super->s_dev) blkdev_mode &= ~FMODE_EXCL ; - journal->j_dev_bd =open_by_devnum (jdev, blkdev_mode, journal); + journal->j_dev_bd =blkdev_get_by_dev (jdev, blkdev_mode, + journal); journal->j_dev_mode = blkdev_mode;if (IS_ERR (journal->j_dev_bd)) { result =PTR_ERR (journal->j_dev_bd);
@@ -2601,8 +2602,7 @@ static int journal_init_dev(struct super_block *super, } journal->j_dev_mode = blkdev_mode; - journal->j_dev_bd =open_bdev_exclusive (jdev_name, - blkdev_mode, journal); + journal->j_dev_bd =blkdev_get_by_path (jdev_name, blkdev_mode, journal);if (IS_ERR (journal->j_dev_bd)) { result =PTR_ERR (journal->j_dev_bd); journal->j_dev_bd =NULL ;
fs/super.c +5 -4
@@ -766,13 +766,13 @@ struct dentry *mount_bdev(struct file_system_type *fs_type, {struct block_device *bdev;struct super_block *s; -fmode_t mode =FMODE_READ ; +fmode_t mode =FMODE_READ |FMODE_EXCL ;int error =0 ;if (!(flags &MS_RDONLY )) mode |=FMODE_WRITE ; - bdev =open_bdev_exclusive (dev_name, mode, fs_type); + bdev =blkdev_get_by_path (dev_name, mode, fs_type);if (IS_ERR (bdev))return ERR_CAST (bdev);
@@ -807,7 +807,7 @@ struct dentry *mount_bdev(struct file_system_type *fs_type,* holding an active reference. */ up_write (&s->s_umount); -blkdev_put (bdev, mode |FMODE_EXCL ); +blkdev_put (bdev, mode);down_write (&s->s_umount); }else {char b[BDEVNAME_SIZE ];
@@ -831,7 +831,7 @@ struct dentry *mount_bdev(struct file_system_type *fs_type, error_s: error =PTR_ERR (s); error_bdev: -blkdev_put (bdev, mode |FMODE_EXCL ); +blkdev_put (bdev, mode); error:return ERR_PTR (error); }
@@ -862,6 +862,7 @@ void kill_block_super(struct super_block *sb) bdev->bd_super =NULL ;generic_shutdown_super (sb);sync_blockdev (bdev); +WARN_ON_ONCE (!(mode &FMODE_EXCL ));blkdev_put (bdev, mode |FMODE_EXCL ); }
fs/xfs/linux-2.6/xfs_super.c +2 -1
@@ -609,7 +609,8 @@ xfs_blkdev_get( {int error =0 ; - *bdevp =open_bdev_exclusive (name,FMODE_READ |FMODE_WRITE , mp); + *bdevp =blkdev_get_by_path (name,FMODE_READ |FMODE_WRITE |FMODE_EXCL , + mp);if (IS_ERR (*bdevp)) { error =PTR_ERR (*bdevp);printk ("XFS: Invalid device [%s], error=%d\n" , name, error);
include/linux/fs.h +4 -3
@@ -2006,8 +2006,6 @@ extern struct block_device *bdgrab(struct block_device *bdev);extern void bd_set_size (struct block_device *,loff_t size);extern void bd_forget (struct inode *inode);extern void bdput (struct block_device *); -extern struct block_device *open_by_devnum (dev_t dev,fmode_t mode, -void *holder);extern void invalidate_bdev (struct block_device *);extern int sync_blockdev (struct block_device *bdev);extern struct super_block *freeze_bdev (struct block_device *);
@@ -2039,6 +2037,10 @@ extern int ioctl_by_bdev(struct block_device *, unsigned, unsigned long);extern int blkdev_ioctl (struct block_device *,fmode_t ,unsigned ,unsigned long );extern long compat_blkdev_ioctl (struct file *,unsigned ,unsigned long );extern int blkdev_get (struct block_device *bdev,fmode_t mode,void *holder); +extern struct block_device *blkdev_get_by_path (const char *path,fmode_t mode, +void *holder); +extern struct block_device *blkdev_get_by_dev (dev_t dev,fmode_t mode, +void *holder);extern int blkdev_put (struct block_device *bdev,fmode_t mode);#ifdef CONFIG_SYSFS extern int bd_link_disk_holder (struct block_device *bdev,struct gendisk *disk);
@@ -2083,7 +2085,6 @@ static inline void unregister_chrdev(unsigned int major, const char *name)extern const char *__bdevname (dev_t ,char *buffer);extern const char *bdevname (struct block_device *bdev,char *buffer);extern struct block_device *lookup_bdev (const char *); -extern struct block_device *open_bdev_exclusive (const char *,fmode_t ,void *);extern void blkdev_show (struct seq_file *,off_t );#else
kernel/power/swap.c +2 -2
@@ -907,8 +907,8 @@ int swsusp_check(void) {int error; - hib_resume_bdev =open_by_devnum (swsusp_resume_device, -FMODE_READ ,NULL ); + hib_resume_bdev =blkdev_get_by_dev (swsusp_resume_device, +FMODE_READ ,NULL );if (!IS_ERR (hib_resume_bdev)) {set_blocksize (hib_resume_bdev,PAGE_SIZE );clear_page (swsusp_header);
Signature · 1 line
1.7.1
Hello,
I just appended two patches to the series. These two are the blkdev_get_by_*() cleanup patches suggested in the fourth patch which Christoph liked.
I updated the git tree accordingly and added acked-by's.
git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git cleanup-bd_claim
Jens, if you want the whole series resent, please let me know.
Thanks.
Signature · 1 line
tejun
Quoted 11 lines · Tejun Heo
Hello,
I just appended two patches to the series. These two are the blkdev_get_by_*() cleanup patches suggested in the fourth patch which Christoph liked.
I updated the git tree accordingly and added acked-by's.
git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.gitcleanup-bd_claimJens, if you want the whole series resent, please let me know.
Ping.
Signature · 1 line
tejun
Jens Axboe
maintainerQuoted 7 lines · Tejun Heo
Quoted 6 lines · Tejun Heo
Hello,
I just appended two patches to the series. These two are the blkdev_get_by_*() cleanup patches suggested in the fourth patch which Christoph liked.
Quoted 7 lines
Quoted 5 lines
I updated the git tree accordingly and added acked-by's.
git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.gitcleanup-bd_claimJens, if you want the whole series resent, please let me know.
Ping.
You don't have to resend it, I'll pull it in.
Signature · 1 line
Jens Axboe
Quoted 11 lines · Tejun Heo
Hello,
I just appended two patches to the series. These two are the blkdev_get_by_*() cleanup patches suggested in the fourth patch which Christoph liked.
I updated the git tree accordingly and added acked-by's.
git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.gitcleanup-bd_claimJens, if you want the whole series resent, please let me know.
Ping.
Signature · 1 line
tejun
Hello,
I just appended two patches to the series. These two are the blkdev_get_by_*() cleanup patches suggested in the fourth patch which Christoph liked.
I updated the git tree accordingly and added acked-by's.
git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git cleanup-bd_claim
Jens, if you want the whole series resent, please let me know.
Thanks.
Signature · 1 line
tejun