block: Make blkdev_get_by_*() return handle
Subsystems (31)
Jan Kara
reviewercover block: Make blkdev_get_by_*() return handle
Hello,
this patch series implements the idea of blkdev_get_by_*() calls returning bdev_handle which is then passed to blkdev_put() [1]. This makes the get and put calls for bdevs more obviously matching and allows us to propagate context from get to put without having to modify all the users (again!). In particular I need to propagate used open flags to blkdev_put() to be able count writeable opens and add support for blocking writes to mounted block devices. I'll send that series separately.
The series is based on Linus' tree as of yesterday + two bcache fixes which are in the block tree. Patches have passed some basic testing, I plan to test more users once we agree this is the right way to go.
Honza
[1] https://lore.kernel.org/all/[email protected]
Jan Kara
reviewerPATCH 1/32 block: Provide blkdev_get_handle_* functions
Create struct bdev_handle that contains all parameters that need to be passed to blkdev_put() and provide blkdev_get_handle_* functions that return this structure instead of plain bdev pointer. This will eventually allow us to pass one more argument to blkdev_put() without too much hassle.
--- block/bdev.c | 47 ++++++++++++++++++++++++++++++++++++++++++ include/linux/blkdev.h | 10 +++++++++ 2 files changed, 57 insertions(+)
block/bdev.c +47 -0
@@ -846,6 +846,24 @@ struct block_device *blkdev_get_by_dev(dev_t dev, blk_mode_t mode, void *holder, }EXPORT_SYMBOL (blkdev_get_by_dev); +struct bdev_handle *blkdev_get_handle_by_dev (dev_t dev,blk_mode_t mode, +void *holder,const struct blk_holder_ops *hops) +{ +struct bdev_handle *handle =kmalloc (sizeof (struct bdev_handle ), +GFP_KERNEL ); +struct block_device *bdev; + +if (!handle) +return ERR_PTR (-ENOMEM ); + bdev =blkdev_get_by_dev (dev, mode, holder, hops); +if (IS_ERR (bdev)) +return ERR_CAST (bdev); + handle->bdev = bdev; + handle->holder = holder; +return handle; +} +EXPORT_SYMBOL (blkdev_get_handle_by_dev); +/** * blkdev_get_by_path - open a block device by name * @path: path to the block device to open
@@ -884,6 +902,28 @@ struct block_device *blkdev_get_by_path(const char *path, blk_mode_t mode, }EXPORT_SYMBOL (blkdev_get_by_path); +struct bdev_handle *blkdev_get_handle_by_path (const char *path,blk_mode_t mode, +void *holder,const struct blk_holder_ops *hops) +{ +struct bdev_handle *handle; +dev_t dev; +int error; + + error =lookup_bdev (path, &dev); +if (error) +return ERR_PTR (error); + + handle =blkdev_get_handle_by_dev (dev, mode, holder, hops); +if (!IS_ERR (handle) && (mode &BLK_OPEN_WRITE ) && +bdev_read_only (handle->bdev)) { +blkdev_handle_put (handle); +return ERR_PTR (-EACCES ); + } + +return handle; +} +EXPORT_SYMBOL (blkdev_get_handle_by_path); +void blkdev_put (struct block_device *bdev,void *holder) {struct gendisk *disk = bdev->bd_disk;
@@ -920,6 +960,13 @@ void blkdev_put(struct block_device *bdev, void *holder) }EXPORT_SYMBOL (blkdev_put); +void blkdev_handle_put (struct bdev_handle *handle) +{ +blkdev_put (handle->bdev, handle->holder); +kfree (handle); +} +EXPORT_SYMBOL (blkdev_handle_put); +/** * lookup_bdev() - Look up a struct block_device by name. * @pathname: Name of the block device in the filesystem.
include/linux/blkdev.h +10 -0
@@ -1471,14 +1471,24 @@ struct blk_holder_ops {#define sb_open_mode (flags) \ (BLK_OPEN_READ | (((flags) & SB_RDONLY) ? 0 : BLK_OPEN_WRITE)) +struct bdev_handle { +struct block_device *bdev; +void *holder; +}; +struct block_device *blkdev_get_by_dev (dev_t dev,blk_mode_t mode,void *holder,const struct blk_holder_ops *hops);struct block_device *blkdev_get_by_path (const char *path,blk_mode_t mode,void *holder,const struct blk_holder_ops *hops); +struct bdev_handle *blkdev_get_handle_by_dev (dev_t dev,blk_mode_t mode, +void *holder,const struct blk_holder_ops *hops); +struct bdev_handle *blkdev_get_handle_by_path (const char *path,blk_mode_t mode, +void *holder,const struct blk_holder_ops *hops);int bd_prepare_to_claim (struct block_device *bdev,void *holder,const struct blk_holder_ops *hops);void bd_abort_claiming (struct block_device *bdev,void *holder);void blkdev_put (struct block_device *bdev,void *holder); +void blkdev_handle_put (struct bdev_handle *handle);/* just for blk-cgroup, don't use elsewhere */ struct block_device *blkdev_get_no_open (dev_t dev);
Signature · 1 line
2.35.3
Re: [PATCH 01/32] block: Provide blkdev_get_handle_* functions
block/bdev.c struct block_device *blkdev_get_by_dev(dev_t dev, blk_mode_t mode, void *holder, · line 860
Quoted 12 lines · Jan Kara
block/bdev.c +12
-0+struct bdev_handle *blkdev_get_handle_by_dev (dev_t dev,blk_mode_t mode, +void *holder,const struct blk_holder_ops *hops) +{ +struct bdev_handle *handle =kmalloc (sizeof (struct bdev_handle ), +GFP_KERNEL ); +struct block_device *bdev; + +if (!handle) +return ERR_PTR (-ENOMEM ); + bdev =blkdev_get_by_dev (dev, mode, holder, hops); +if (IS_ERR (bdev)) +return ERR_CAST (bdev);
Would we be better off with a handle->error (and a NULL return from this function means "we couldn't allocate a handle")? I have no objection to what you've done here, just wondering if it might end up nicer for the users.
Jan Kara
reviewerRe: [PATCH 01/32] block: Provide blkdev_get_handle_* functions
Quoted 10 lines · Matthew Wilcox
Quoted 9 lines · Jan Kara
block/bdev.c +9
-0+struct bdev_handle *blkdev_get_handle_by_dev (dev_t dev,blk_mode_t mode, +void *holder,const struct blk_holder_ops *hops) +{ +struct bdev_handle *handle =kmalloc (sizeof (struct bdev_handle ), +GFP_KERNEL ); +struct block_device *bdev; + +if (!handle) +return ERR_PTR (-ENOMEM );
Quoted 8 lines
block/bdev.c struct block_device *blkdev_get_by_dev(dev_t dev, blk_mode_t mode, void *holder, · line 860
Quoted 3 lines
block/bdev.c +3
-0+ bdev =blkdev_get_by_dev (dev, mode, holder, hops); +if (IS_ERR (bdev)) +return ERR_CAST (bdev);Would we be better off with a
handle->error(and a NULL return from this function means "we couldn't allocate a handle")? I have no objection to what you've done here, just wondering if it might end up nicer for the users.
Hum, I've checked a couple of users and it seems it would be more complicated for the users to handle this convention than the one I've chosen. And that one is also pretty standard so I think by the principle of least surprise it is also better.
Honza
Quoted 1 line
Signature · 2 lines
Jan Kara <jack-IBi9RG/[email protected]> SUSE Labs, CR
Re: [PATCH 01/32] block: Provide blkdev_get_handle_* functions
In reply to Jan Karainclude/linux/blkdev.h struct blk_holder_ops { · line 1477
Quoted 4 lines · Jan Kara
include/linux/blkdev.h +4
-0+struct bdev_handle { +struct block_device *bdev; +void *holder; +};
Please explain in the patch description why a holder pointer is introduced in struct bdev_handle and how it relates to the bd_holder pointer in struct block_device. Is one of the purposes of this patch series perhaps to add support for multiple holders per block device?
Thanks,
Bart.
Re: [PATCH 01/32] block: Provide blkdev_get_handle_* functions
Quoted 10 lines · Bart Van Assche
include/linux/blkdev.h struct blk_holder_ops { · line 1477
Quoted 4 lines · Jan Kara
include/linux/blkdev.h +4
-0+struct bdev_handle { +struct block_device *bdev; +void *holder; +};Please explain in the patch description why a holder pointer is introduced in struct
bdev_handleand how it relates to thebd_holderpointer in structblock_device. Is one of the purposes of this patch series perhaps to add support for multiple holders per block device?
That is all in patch 0/32. Why repeat it?
Re: [PATCH 01/32] block: Provide blkdev_get_handle_* functions
Quoted 12 lines · Matthew Wilcox
Quoted 10 lines · Bart Van Assche
include/linux/blkdev.h struct blk_holder_ops { · line 1477
Quoted 4 lines · Jan Kara
include/linux/blkdev.h +4
-0+struct bdev_handle { +struct block_device *bdev; +void *holder; +};Please explain in the patch description why a holder pointer is introduced in struct
bdev_handleand how it relates to thebd_holderpointer in structblock_device. Is one of the purposes of this patch series perhaps to add support for multiple holders per block device?
Quoted 1 line
That is all in patch 0/32. Why repeat it?
This cover letter: https://lore.kernel.org/linux-block/[email protected]/T/#t?
The word "holder" doesn't even occur in that cover letter so how could the answer to my question be present in the cover letter?
Bart.
Jan Kara
reviewerRe: [PATCH 01/32] block: Provide blkdev_get_handle_* functions
In reply to Bart Van AsscheQuoted 10 lines · Bart Van Assche
include/linux/blkdev.h struct blk_holder_ops { · line 1477
Quoted 4 lines · Jan Kara
include/linux/blkdev.h +4
-0+struct bdev_handle { +struct block_device *bdev; +void *holder; +};Please explain in the patch description why a holder pointer is introduced in struct
bdev_handleand how it relates to thebd_holderpointer in structblock_device. Is one of the purposes of this patch series perhaps to add support for multiple holders per block device?
No. The reason for adding holder to struct bdev_handle is that it is an argument blkdev_put() needs. Currently, every user of blkdev_put() has to remember what it has passed as 'holder' to blkdev_get_by_*() call and pass that to blkdev_put(). With struct bdev_handle this will happen automatically. This is already explained in the changelog of this patch:
"Create struct bdev_handle that contains all parameters that need to be passed to blkdev_put()..."
If it was only about holder, the intrusive patches would not be warranted but as the description also says:
"This will eventually allow us to pass one more argument to blkdev_put() without too much hassle."
Because we will additionaly need to propagate the 'mode' argument used at open to blkdev_put().
Honza
Signature · 2 lines
Jan Kara <jack-IBi9RG/[email protected]> SUSE Labs, CR
Keith Busch
maintainerRe: [PATCH 01/32] block: Provide blkdev_get_handle_* functions
In reply to Jan Karablock/bdev.c struct block_device *blkdev_get_by_dev(dev_t dev, blk_mode_t mode, void *holder, · line 853
Quoted 5 lines · Jan Kara
block/bdev.c +5
-0+struct bdev_handle *blkdev_get_handle_by_dev (dev_t dev,blk_mode_t mode, +void *holder,const struct blk_holder_ops *hops) +{ +struct bdev_handle *handle =kmalloc (sizeof (struct bdev_handle ), +GFP_KERNEL );
I believe 'sizeof(*handle)' is the preferred style.
block/bdev.c struct block_device *blkdev_get_by_dev(dev_t dev, blk_mode_t mode, void *holder, · line 860
Quoted 7 lines
block/bdev.c +7
-0+struct block_device *bdev; + +if (!handle) +return ERR_PTR (-ENOMEM ); + bdev =blkdev_get_by_dev (dev, mode, holder, hops); +if (IS_ERR (bdev)) +return ERR_CAST (bdev);
Need a 'kfree(handle)' before the error return. Or would it be simpler to get the bdev first so you can check the mode settings against a read-only bdev prior to the kmalloc?
Quoted 34 lines
block/bdev.c +27
-0+ handle->bdev = bdev; + handle->holder = holder; +return handle; +} +EXPORT_SYMBOL (blkdev_get_handle_by_dev); +/** * blkdev_get_by_path - open a block device by name * @path: path to the block device to open @@ -884,6 +902,28 @@ struct block_device *blkdev_get_by_path(const char *path, blk_mode_t mode, }EXPORT_SYMBOL (blkdev_get_by_path); +struct bdev_handle *blkdev_get_handle_by_path (const char *path,blk_mode_t mode, +void *holder,const struct blk_holder_ops *hops) +{ +struct bdev_handle *handle; +dev_t dev; +int error; + + error =lookup_bdev (path, &dev); +if (error) +return ERR_PTR (error); + + handle =blkdev_get_handle_by_dev (dev, mode, holder, hops); +if (!IS_ERR (handle) && (mode &BLK_OPEN_WRITE ) && +bdev_read_only (handle->bdev)) { +blkdev_handle_put (handle); +return ERR_PTR (-EACCES ); + } + +return handle; +} +EXPORT_SYMBOL (blkdev_get_handle_by_path);
Jan Kara
reviewerRe: [PATCH 01/32] block: Provide blkdev_get_handle_* functions
Quoted 8 lines · Keith Busch
block/bdev.c struct block_device *blkdev_get_by_dev(dev_t dev, blk_mode_t mode, void *holder, · line 853
Quoted 5 lines · Jan Kara
block/bdev.c +5
-0+struct bdev_handle *blkdev_get_handle_by_dev (dev_t dev,blk_mode_t mode, +void *holder,const struct blk_holder_ops *hops) +{ +struct bdev_handle *handle =kmalloc (sizeof (struct bdev_handle ), +GFP_KERNEL );I believe '
sizeof(*handle)' is the preferred style.
OK.
Quoted 11 lines
block/bdev.c struct block_device *blkdev_get_by_dev(dev_t dev, blk_mode_t mode, void *holder, · line 860
Quoted 7 lines
block/bdev.c +7
-0+struct block_device *bdev; + +if (!handle) +return ERR_PTR (-ENOMEM ); + bdev =blkdev_get_by_dev (dev, mode, holder, hops); +if (IS_ERR (bdev)) +return ERR_CAST (bdev);Need a 'kfree(handle)' before the error return. Or would it be simpler to get the bdev first so you can check the mode settings against a read-only bdev prior to the kmalloc?
Yeah. Good point with kfree(). I'm not sure calling blkdev_get_by_dev() first will be "simpler" - then we need blkdev_put() in case of kmalloc() failure. Thanks for review!
Honza
Signature · 2 lines
Jan Kara <jack-IBi9RG/[email protected]> SUSE Labs, CR
Re: [PATCH 01/32] block: Provide blkdev_get_handle_* functions
In reply to Jan KaraQuoted 5 lines · Jan Kara
Create struct
bdev_handlethat contains all parameters that need to be passed toblkdev_put()and provide blkdev_get_handle_* functions that return this structure instead of plain bdev pointer. This will eventually allow us to pass one more argument toblkdev_put()without too much hassle.
Can we use the opportunity to come up with better names? blkdev_get_* was always a rather horrible naming convention for something that ends up calling into ->open.
What about:
struct bdev_handle *bdev_open_by_dev(dev_t dev, blk_mode_t mode, void *holder,
const struct blk_holder_ops *hops); struct bdev_handle *bdev_open_by_path(dev_t dev, blk_mode_t mode, void *holder, const struct blk_holder_ops *hops);
void bdev_release(struct bdev_handle *handle);
?
Jan Kara
reviewerRe: [PATCH 01/32] block: Provide blkdev_get_handle_* functions
Quoted 11 lines · Christoph Hellwig
Quoted 5 lines · Jan Kara
Create struct
bdev_handlethat contains all parameters that need to be passed toblkdev_put()and provide blkdev_get_handle_* functions that return this structure instead of plain bdev pointer. This will eventually allow us to pass one more argument toblkdev_put()without too much hassle.Can we use the opportunity to come up with better names? blkdev_get_* was always a rather horrible naming convention for something that ends up calling into ->open.
Quoted 7 lines
What about:
struct
bdev_handle*bdev_open_by_dev(dev_t dev,blk_mode_tmode, void *holder,const struct blk_holder_ops *hops); struct bdev_handle *bdev_open_by_path(dev_t dev, blk_mode_t mode, void *holder, const struct blk_holder_ops *hops);void
bdev_release(struct bdev_handle *handle);
I'd maybe use bdev_close() instead of bdev_release() but otherwise I like the new naming.
Honza
Signature · 2 lines
Jan Kara <jack-IBi9RG/[email protected]> SUSE Labs, CR
Re: [PATCH 01/32] block: Provide blkdev_get_handle_* functions
Quoted 6 lines · Jan Kara
Quoted 3 lines
struct
bdev_handle*bdev_open_by_path(dev_t dev,blk_mode_tmode,void *holder, const struct blk_holder_ops *hops);void
bdev_release(struct bdev_handle *handle);I'd maybe use
bdev_close()instead ofbdev_release()but otherwise I like the new naming.
We're using release everywhese else, but if Jens is fine with that I can live with close.
Jan Kara
reviewerRe: [PATCH 01/32] block: Provide blkdev_get_handle_* functions
Quoted 10 lines · Christoph Hellwig
Quoted 6 lines · Jan Kara
Quoted 3 lines
struct
bdev_handle*bdev_open_by_path(dev_t dev,blk_mode_tmode,void *holder, const struct blk_holder_ops *hops);void
bdev_release(struct bdev_handle *handle);I'd maybe use
bdev_close()instead ofbdev_release()but otherwise I like the new naming.We're using release everywhese else, but if Jens is fine with that I can live with close.
Dunno, to me words pair like open-close, get-put, acquire-release. Furthermore e.g. ->release() (and thus blkdev_release()) is called only when the last file reference is dropped, not when each reference is dropped, so that's why bdev_release() seems a bit confusing to me.
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Haris Iqbal
maintainerRe: [PATCH 01/32] block: Provide blkdev_get_handle_* functions
In reply to Christoph HellwigQuoted 11 lines · Christoph Hellwig
Quoted 5 lines · Jan Kara
Create struct
bdev_handlethat contains all parameters that need to be passed toblkdev_put()and provide blkdev_get_handle_* functions that return this structure instead of plain bdev pointer. This will eventually allow us to pass one more argument toblkdev_put()without too much hassle.Can we use the opportunity to come up with better names? blkdev_get_* was always a rather horrible naming convention for something that ends up calling into ->open.
Quoted 9 lines
What about:
struct
bdev_handle*bdev_open_by_dev(dev_t dev,blk_mode_tmode, void *holder,const struct blk_holder_ops *hops); struct bdev_handle *bdev_open_by_path(dev_t dev, blk_mode_t mode, void *holder, const struct blk_holder_ops *hops);void
bdev_release(struct bdev_handle *handle);
+1 to this.
Also, if we are removing "handle" from the function, should the name of the structure it returns also change? Would something like bdev_ctx be better?
Quoted 3 lines
?
Haris Iqbal
maintainerRe: [PATCH 01/32] block: Provide blkdev_get_handle_* functions
In reply to Christoph HellwigQuoted 12 lines · On Thu, Jul 6, 2023 at 5:38 PM Christoph Hellwig <[email protected]> wrote:
Quoted 5 lines · Jan Kara
Create struct
bdev_handlethat contains all parameters that need to be passed toblkdev_put()and provide blkdev_get_handle_* functions that return this structure instead of plain bdev pointer. This will eventually allow us to pass one more argument toblkdev_put()without too much hassle.Can we use the opportunity to come up with better names? blkdev_get_* was always a rather horrible naming convention for something that ends up calling into ->open.
Quoted 7 lines
What about:
struct
bdev_handle*bdev_open_by_dev(dev_t dev,blk_mode_tmode, void *holder,const struct blk_holder_ops *hops); struct bdev_handle *bdev_open_by_path(dev_t dev, blk_mode_t mode, void *holder, const struct blk_holder_ops *hops);void
bdev_release(struct bdev_handle *handle);
+1 to this.
Also, if we are removing "handle" from the function, should the name of the structure it returns also change? Would something like bdev_ctx be better?
(Apologies for the previous non-plaintext email)
Quoted 2 lines
?
Jan Kara
reviewerRe: [PATCH 01/32] block: Provide blkdev_get_handle_* functions
Quoted 21 lines · Haris Iqbal
Quoted 12 lines · On Thu, Jul 6, 2023 at 5:38 PM Christoph Hellwig <[email protected]> wrote:
Quoted 5 lines · Jan Kara
Create struct
bdev_handlethat contains all parameters that need to be passed toblkdev_put()and provide blkdev_get_handle_* functions that return this structure instead of plain bdev pointer. This will eventually allow us to pass one more argument toblkdev_put()without too much hassle.Can we use the opportunity to come up with better names? blkdev_get_* was always a rather horrible naming convention for something that ends up calling into ->open.
Quoted 7 lines
What about:
struct
bdev_handle*bdev_open_by_dev(dev_t dev,blk_mode_tmode, void *holder,const struct blk_holder_ops *hops); struct bdev_handle *bdev_open_by_path(dev_t dev, blk_mode_t mode, void *holder, const struct blk_holder_ops *hops);void
bdev_release(struct bdev_handle *handle);
Quoted 4 lines
+1 to this.
Also, if we are removing "handle" from the function, should the name of the structure it returns also change? Would something likebdev_ctxbe better?
I think the bdev_handle name is fine for the struct. After all it is equivalent of an open handle for the block device so IMHO bdev_handle captures that better than bdev_ctx.
Honza
Signature · 6 lines
Jan Kara <[email protected]> SUSE Labs, CR _______________________________________________ drbd-dev mailing list [email protected] https://lists.linbit.com/mailman/listinfo/drbd-dev
Re: [PATCH 01/32] block: Provide blkdev_get_handle_* functions
Quoted 3 lines · Jan Kara
I think the
bdev_handlename is fine for the struct. After all it is equivalent of an open handle for the block device so IMHObdev_handlecaptures that better thanbdev_ctx.
Agreed.
Jan Kara
reviewerPATCH 2/32 block: Use file->f_flags for determining exclusive opens in file_to_blk_mode()
In reply to Jan KaraUse file->f_flags instead of file->private_data for determining whether we should set BLK_OPEN_EXCL flag. This allows us to remove somewhat awkward setting of file->private_data before calling file_to_blk_mode() and it also makes following conversion to blkdev_get_handle_by_dev() simpler.
--- block/fops.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
block/fops.c +7 -10
@@ -478,7 +478,7 @@ blk_mode_t file_to_blk_mode(struct file *file) mode |=BLK_OPEN_READ ;if (file->f_mode &FMODE_WRITE ) mode |=BLK_OPEN_WRITE ; -if (file->private_data) +if (file->f_flags &O_EXCL ) mode |=BLK_OPEN_EXCL ;if (file->f_flags &O_NDELAY ) mode |=BLK_OPEN_NDELAY ;
@@ -497,6 +497,7 @@ blk_mode_t file_to_blk_mode(struct file *file)static int blkdev_open (struct inode *inode,struct file *filp) {struct block_device *bdev; +blk_mode_t mode;/* * Preserve backwards compatibility and allow large file access
@@ -507,18 +508,14 @@ static int blkdev_open(struct inode *inode, struct file *filp) filp->f_flags |=O_LARGEFILE ; filp->f_mode |=FMODE_BUF_RASYNC ; -/* -* Use the file private data to store the holder for exclusive openes. -* file_to_blk_mode relies on it being present to set BLK_OPEN_EXCL. -*/ -if (filp->f_flags &O_EXCL ) - filp->private_data = filp; - - bdev =blkdev_get_by_dev (inode->i_rdev,file_to_blk_mode (filp), - filp->private_data,NULL ); + mode =file_to_blk_mode (filp); + bdev =blkdev_get_by_dev (inode->i_rdev, mode, + mode &BLK_OPEN_EXCL ? filp :NULL ,NULL );if (IS_ERR (bdev))return PTR_ERR (bdev); +if (mode &BLK_OPEN_EXCL ) + filp->private_data = filp;if (bdev_nowait (bdev)) filp->f_mode |=FMODE_NOWAIT ;
Signature · 1 line
2.35.3
Re: [PATCH 02/32] block: Use file->f_flags for determining exclusive opens in file_to_blk_mode()
Quoted 5 lines · Jan Kara
Use
file->f_flagsinstead offile->private_datafor determining whether we should setBLK_OPEN_EXCLflag. This allows us to remove somewhat awkward setting offile->private_databefore callingfile_to_blk_mode()and it also makes following conversion toblkdev_get_handle_by_dev()simpler.
While this looks a lot nicer, I don't think it actually works given that do_dentry_open clears out O_EXCL, and thus it won't be set when calling into blkdev_ioctl.
Jan Kara
reviewerRe: [PATCH 02/32] block: Use file->f_flags for determining exclusive opens in file_to_blk_mode()
Quoted 10 lines · Christoph Hellwig
Quoted 5 lines · Jan Kara
Use
file->f_flagsinstead offile->private_datafor determining whether we should setBLK_OPEN_EXCLflag. This allows us to remove somewhat awkward setting offile->private_databefore callingfile_to_blk_mode()and it also makes following conversion toblkdev_get_handle_by_dev()simpler.While this looks a lot nicer, I don't think it actually works given that
do_dentry_openclears outO_EXCL, and thus it won't be set when calling intoblkdev_ioctl.
Aha, good point! So I need to workaround this a bit differently. I think the best would be to have file_to_blk_mode() for blkdev_open() only and make the other places (which already have bdev_handle available from struct file) use bdev_handle->mode. But I have to come up with a sane transition to that state :).
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Re: [PATCH 02/32] block: Use file->f_flags for determining exclusive opens in file_to_blk_mode()
Quoted 8 lines · Jan Kara
Quoted 3 lines
While this looks a lot nicer, I don't think it actually works given that
do_dentry_openclears outO_EXCL, and thus it won't be set when calling intoblkdev_ioctl.Aha, good point! So I need to workaround this a bit differently. I think the best would be to have
file_to_blk_mode()forblkdev_open()only and make the other places (which already havebdev_handleavailable from struct file) usebdev_handle->mode.
Exactly.
Quoted 2 lines
But I have to come up with a sane
transition to that state :).
I think you can simply do it in the patch switching the block device to be handle based.
Jan Kara
reviewerPATCH 3/32 block: Use blkdev_get_handle_by_dev() in blkdev_open()
In reply to Jan KaraConvert blkdev_open() to use blkdev_get_handle_by_dev().
--- block/fops.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
block/fops.c +9 -8
@@ -496,7 +496,7 @@ blk_mode_t file_to_blk_mode(struct file *file)static int blkdev_open (struct inode *inode,struct file *filp) { -struct block_device *bdev; +struct bdev_handle *handle;blk_mode_t mode;/*
@@ -509,24 +509,25 @@ static int blkdev_open(struct inode *inode, struct file *filp) filp->f_mode |=FMODE_BUF_RASYNC ; mode =file_to_blk_mode (filp); - bdev =blkdev_get_by_dev (inode->i_rdev, mode, - mode &BLK_OPEN_EXCL ? filp :NULL ,NULL ); -if (IS_ERR (bdev)) -return PTR_ERR (bdev); + handle =blkdev_get_handle_by_dev (inode->i_rdev, mode, + mode &BLK_OPEN_EXCL ? filp :NULL ,NULL ); +if (IS_ERR (handle)) +return PTR_ERR (handle);if (mode &BLK_OPEN_EXCL ) filp->private_data = filp; -if (bdev_nowait (bdev)) +if (bdev_nowait (handle->bdev)) filp->f_mode |=FMODE_NOWAIT ; - filp->f_mapping = bdev->bd_inode->i_mapping; + filp->f_mapping = handle->bdev->bd_inode->i_mapping; filp->f_wb_err =filemap_sample_wb_err (filp->f_mapping); + filp->private_data = handle;return 0 ; }static int blkdev_release (struct inode *inode,struct file *filp) { -blkdev_put (I_BDEV (filp->f_mapping->host), filp->private_data); +blkdev_handle_put (filp->private_data);return 0 ; }
Signature · 1 line
2.35.3
Re: [PATCH 03/32] block: Use blkdev_get_handle_by_dev() in blkdev_open()
Quoted 25 lines · Jan Kara
Convert
blkdev_open()to useblkdev_get_handle_by_dev().Signed-off-by Jan Kara <[email protected]>---
block/fops.c| 17 +++++++++--------1 file changed, 9 insertions(+), 8 deletions(-)block/fops.c +1
-2@@ -496,7 +496,7 @@ blk_mode_t file_to_blk_mode(struct file *file)static int blkdev_open (struct inode *inode,struct file *filp) { -struct block_device *bdev; +struct bdev_handle *handle;blk_mode_t mode;/* @@ -509,24 +509,25 @@ static int blkdev_open(struct inode *inode, struct file *filp) filp->f_mode |=FMODE_BUF_RASYNC ; mode =file_to_blk_mode (filp); - bdev = blkdev_get_by_dev(inode->i_rdev, mode,
block/fops.c static int blkdev_open(struct inode *inode, struct file *filp) · line 518
Quoted 10 lines
block/fops.c +4
-3- mode & BLK_OPEN_EXCL ? filp : NULL, NULL); -if (IS_ERR (bdev)) -return PTR_ERR (bdev); + handle =blkdev_get_handle_by_dev (inode->i_rdev, mode, + mode &BLK_OPEN_EXCL ? filp :NULL ,NULL ); +if (IS_ERR (handle)) +return PTR_ERR (handle);if (mode &BLK_OPEN_EXCL ) filp->private_data = filp;
Is this needed?
This is getting overwritten after a couple of lines below.
block/fops.c static int blkdev_open(struct inode *inode, struct file *filp) · line 524
Quoted 8 lines
block/fops.c +3
-2-if (bdev_nowait (bdev)) +if (bdev_nowait (handle->bdev)) filp->f_mode |=FMODE_NOWAIT ; - filp->f_mapping = bdev->bd_inode->i_mapping; + filp->f_mapping = handle->bdev->bd_inode->i_mapping; filp->f_wb_err =filemap_sample_wb_err (filp->f_mapping); + filp->private_data = handle;
Here.
Jan Kara
reviewerRe: [PATCH 03/32] block: Use blkdev_get_handle_by_dev() in blkdev_open()
Quoted 44 lines · Kanchan Joshi
Quoted 25 lines · Jan Kara
Convert
blkdev_open()to useblkdev_get_handle_by_dev().Signed-off-by Jan Kara <[email protected]>---
block/fops.c| 17 +++++++++--------1 file changed, 9 insertions(+), 8 deletions(-)block/fops.c +1
-2@@ -496,7 +496,7 @@ blk_mode_t file_to_blk_mode(struct file *file)static int blkdev_open (struct inode *inode,struct file *filp) { -struct block_device *bdev; +struct bdev_handle *handle;blk_mode_t mode;/* @@ -509,24 +509,25 @@ static int blkdev_open(struct inode *inode, struct file *filp) filp->f_mode |=FMODE_BUF_RASYNC ; mode =file_to_blk_mode (filp); - bdev = blkdev_get_by_dev(inode->i_rdev, mode,block/fops.c static int blkdev_open(struct inode *inode, struct file *filp) · line 518
Quoted 10 lines
block/fops.c +4
-3- mode & BLK_OPEN_EXCL ? filp : NULL, NULL); -if (IS_ERR (bdev)) -return PTR_ERR (bdev); + handle =blkdev_get_handle_by_dev (inode->i_rdev, mode, + mode &BLK_OPEN_EXCL ? filp :NULL ,NULL ); +if (IS_ERR (handle)) +return PTR_ERR (handle);if (mode &BLK_OPEN_EXCL ) filp->private_data = filp;Is this needed?
This is getting overwritten after a couple of lines below.Quoted 4 lines
block/fops.c +1
-1-if (bdev_nowait (bdev)) +if (bdev_nowait (handle->bdev)) filp->f_mode |=FMODE_NOWAIT ;
Quoted 6 lines
block/fops.c static int blkdev_open(struct inode *inode, struct file *filp) · line 524
Quoted 4 lines
block/fops.c +2
-1- filp->f_mapping = bdev->bd_inode->i_mapping; + filp->f_mapping = handle->bdev->bd_inode->i_mapping; filp->f_wb_err =filemap_sample_wb_err (filp->f_mapping); + filp->private_data = handle;Here.
Good point, I'll fix that for the next version. Thanks for review!
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jan Kara
reviewerPATCH 4/32 block: Use blkdev_get_handle_by_dev() in disk_scan_partitions() and blkdev_bszset()
In reply to Jan KaraConvert disk_scan_partitions() and blkdev_bszset() to use blkdev_get_handle_by_dev().
--- block/genhd.c | 12 ++++++------ block/ioctl.c | 6 ++++-- 2 files changed, 10 insertions(+), 8 deletions(-)
block/genhd.c +6 -6
@@ -342,7 +342,7 @@ EXPORT_SYMBOL_GPL(disk_uevent);int disk_scan_partitions (struct gendisk *disk,blk_mode_t mode) { -struct block_device *bdev; +struct bdev_handle *handle;int ret =0 ;if (disk->flags & (GENHD_FL_NO_PART |GENHD_FL_HIDDEN ))
@@ -366,12 +366,12 @@ int disk_scan_partitions(struct gendisk *disk, blk_mode_t mode) }set_bit (GD_NEED_PART_SCAN , &disk->state); - bdev =blkdev_get_by_dev (disk_devt (disk), mode & ~BLK_OPEN_EXCL ,NULL , -NULL ); -if (IS_ERR (bdev)) - ret =PTR_ERR (bdev); + handle =blkdev_get_handle_by_dev (disk_devt (disk), + mode & ~BLK_OPEN_EXCL ,NULL ,NULL ); +if (IS_ERR (handle)) + ret =PTR_ERR (handle);else -blkdev_put (bdev,NULL ); +blkdev_handle_put (handle);/* * If blkdev_get_by_dev() failed early, GD_NEED_PART_SCAN is still set,
block/ioctl.c +4 -2
@@ -458,6 +458,7 @@ static int blkdev_bszset(struct block_device *bdev, blk_mode_t mode, int __user *argp) {int ret, n; +struct bdev_handle *handle;if (!capable (CAP_SYS_ADMIN ))return -EACCES ;
@@ -469,10 +470,11 @@ static int blkdev_bszset(struct block_device *bdev, blk_mode_t mode,if (mode &BLK_OPEN_EXCL )return set_blocksize (bdev, n); -if (IS_ERR (blkdev_get_by_dev (bdev->bd_dev, mode, &bdev,NULL ))) + handle =blkdev_get_handle_by_dev (bdev->bd_dev, mode, &bdev,NULL ); +if (IS_ERR (handle))return -EBUSY ; ret =set_blocksize (bdev, n); -blkdev_put (bdev, &bdev); +blkdev_handle_put (handle);return ret; }
Signature · 1 line
2.35.3
Jan Kara
reviewerPATCH 5/32 drdb: Convert to use blkdev_get_handle_by_path()
In reply to Jan KaraConvert drdb to use blkdev_get_handle_by_path().
--- drivers/block/drbd/drbd_int.h | 2 ++ drivers/block/drbd/drbd_nl.c | 65 +++++++++++++++++------------------ 2 files changed, 34 insertions(+), 33 deletions(-)
drivers/block/drbd/drbd_int.h +2 -0
@@ -524,7 +524,9 @@ struct drbd_md {struct drbd_backing_dev {struct block_device *backing_bdev; +struct bdev_handle *backing_bdev_handle;struct block_device *md_bdev; +struct bdev_handle *md_bdev_handle;struct drbd_md md;struct disk_conf *disk_conf;/* RCU, for updates: resource->conf_update */ sector_t known_size;/* last known size of that backing device */
drivers/block/drbd/drbd_nl.c +32 -33
131 lines not on this page · raw message
Signature · 1 line
2.35.3
Jan Kara
reviewerPATCH 6/32 pktcdvd: Convert to blkdev_get_handle_by_dev()
In reply to Jan KaraConvert pktcdvd to use blkdev_get_handle_by_dev().
--- drivers/block/pktcdvd.c | 76 ++++++++++++++++++++++------------------- include/linux/pktcdvd.h | 4 ++- 2 files changed, 44 insertions(+), 36 deletions(-)
drivers/block/pktcdvd.c +41 -35
@@ -340,8 +340,8 @@ static ssize_t device_map_show(const struct class *c, const struct class_attribu n +=sysfs_emit_at (data, n,"%s %u:%u %u:%u\n" , pd->disk->disk_name,MAJOR (pd->pkt_dev),MINOR (pd->pkt_dev), -MAJOR (pd->bdev->bd_dev), -MINOR (pd->bdev->bd_dev)); +MAJOR (pd->bdev_handle->bdev->bd_dev), +MINOR (pd->bdev_handle->bdev->bd_dev)); }mutex_unlock (&ctl_mutex);return n;
@@ -437,7 +437,8 @@ static int pkt_seq_show(struct seq_file *m, void *p)char *msg;int states[PACKET_NUM_STATES ]; -seq_printf (m,"Writer %s mapped to %pg:\n" , pd->disk->disk_name, pd->bdev); +seq_printf (m,"Writer %s mapped to %pg:\n" , pd->disk->disk_name, + pd->bdev_handle->bdev);seq_printf (m,"\nSettings:\n" );seq_printf (m,"\tpacket size:\t\t%dkB\n" , pd->settings.size /2 );
@@ -714,7 +715,7 @@ static void pkt_rbtree_insert(struct pktcdvd_device *pd, struct pkt_rb_node *nod*/ static int pkt_generic_packet (struct pktcdvd_device *pd,struct packet_command *cgc) { -struct request_queue *q =bdev_get_queue (pd->bdev); +struct request_queue *q =bdev_get_queue (pd->bdev_handle->bdev);struct scsi_cmnd *scmd;struct request *rq;int ret =0 ;
@@ -1047,7 +1048,8 @@ static void pkt_gather_data(struct pktcdvd_device *pd, struct packet_data *pkt)continue ; bio = pkt->r_bios[f]; -bio_init (bio, pd->bdev, bio->bi_inline_vecs,1 ,REQ_OP_READ ); +bio_init (bio, pd->bdev_handle->bdev, bio->bi_inline_vecs,1 , +REQ_OP_READ ); bio->bi_iter.bi_sector = pkt->sector + f * (CD_FRAMESIZE >>9 ); bio->bi_end_io = pkt_end_io_read; bio->bi_private = pkt;
@@ -1262,8 +1264,8 @@ static void pkt_start_write(struct pktcdvd_device *pd, struct packet_data *pkt)struct device *ddev =disk_to_dev (pd->disk);int f; -bio_init (pkt->w_bio, pd->bdev, pkt->w_bio->bi_inline_vecs, pkt->frames, -REQ_OP_WRITE ); +bio_init (pkt->w_bio, pd->bdev_handle->bdev, pkt->w_bio->bi_inline_vecs, + pkt->frames,REQ_OP_WRITE ); pkt->w_bio->bi_iter.bi_sector = pkt->sector; pkt->w_bio->bi_end_io = pkt_end_io_packet_write; pkt->w_bio->bi_private = pkt;
@@ -2160,18 +2162,20 @@ static int pkt_open_dev(struct pktcdvd_device *pd, bool write)int ret;long lba;struct request_queue *q; -struct block_device *bdev; +struct bdev_handle *bdev_handle;/* * We need to re-open the cdrom device without O_NONBLOCK to be able * to read/write from/to it. It is already opened in O_NONBLOCK mode * so open should not fail. */ - bdev =blkdev_get_by_dev (pd->bdev->bd_dev,BLK_OPEN_READ , pd,NULL ); -if (IS_ERR (bdev)) { - ret =PTR_ERR (bdev); + bdev_handle =blkdev_get_handle_by_dev (pd->bdev_handle->bdev->bd_dev, +BLK_OPEN_READ , pd,NULL ); +if (IS_ERR (bdev_handle)) { + ret =PTR_ERR (bdev_handle); goto out; } + pd->open_bdev_handle = bdev_handle; ret =pkt_get_last_written (pd, &lba);if (ret) {
@@ -2180,9 +2184,9 @@ static int pkt_open_dev(struct pktcdvd_device *pd, bool write) }set_capacity (pd->disk, lba <<2 ); -set_capacity_and_notify (pd->bdev->bd_disk, lba <<2 ); +set_capacity_and_notify (pd->bdev_handle->bdev->bd_disk, lba <<2 ); - q =bdev_get_queue (pd->bdev); + q =bdev_get_queue (pd->bdev_handle->bdev);if (write) { ret =pkt_open_write (pd);if (ret)
@@ -2214,7 +2218,7 @@ static int pkt_open_dev(struct pktcdvd_device *pd, bool write)return 0 ; out_putdev: -blkdev_put (bdev, pd); +blkdev_handle_put (bdev_handle); out:return ret; }
@@ -2233,7 +2237,8 @@ static void pkt_release_dev(struct pktcdvd_device *pd, int flush)pkt_lock_door (pd,0 );pkt_set_speed (pd,MAX_SPEED ,MAX_SPEED ); -blkdev_put (pd->bdev, pd); +blkdev_handle_put (pd->open_bdev_handle); + pd->open_bdev_handle =NULL ;pkt_shrink_pktlist (pd); }
@@ -2321,8 +2326,8 @@ static void pkt_end_io_read_cloned(struct bio *bio)static void pkt_make_request_read (struct pktcdvd_device *pd,struct bio *bio) { -struct bio *cloned_bio = -bio_alloc_clone (pd->bdev, bio,GFP_NOIO , &pkt_bio_set); +struct bio *cloned_bio =bio_alloc_clone (pd->bdev_handle->bdev, bio, +GFP_NOIO , &pkt_bio_set);struct packet_stacked_data *psd =mempool_alloc (&psd_pool,GFP_NOIO ); psd->pd = pd;
@@ -2492,7 +2497,7 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev) {struct device *ddev =disk_to_dev (pd->disk);int i; -struct block_device *bdev; +struct bdev_handle *bdev_handle;struct scsi_device *sdev;if (pd->pkt_dev == dev) {
@@ -2503,8 +2508,9 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev)struct pktcdvd_device *pd2 = pkt_devs[i];if (!pd2)continue ; -if (pd2->bdev->bd_dev == dev) { -dev_err (ddev,"%pg already setup\n" , pd2->bdev); +if (pd2->bdev_handle->bdev->bd_dev == dev) { +dev_err (ddev,"%pg already setup\n" , + pd2->bdev_handle->bdev);return -EBUSY ; }if (pd2->pkt_dev == dev) {
@@ -2513,13 +2519,13 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev) } } - bdev =blkdev_get_by_dev (dev,BLK_OPEN_READ |BLK_OPEN_NDELAY ,NULL , -NULL ); -if (IS_ERR (bdev)) -return PTR_ERR (bdev); - sdev =scsi_device_from_queue (bdev->bd_disk->queue); + bdev_handle =blkdev_get_handle_by_dev (dev, +BLK_OPEN_READ |BLK_OPEN_NDELAY ,NULL ,NULL ); +if (IS_ERR (bdev_handle)) +return PTR_ERR (bdev_handle); + sdev =scsi_device_from_queue (bdev_handle->bdev->bd_disk->queue);if (!sdev) { -blkdev_put (bdev,NULL ); +blkdev_handle_put (bdev_handle);return -EINVAL ; }put_device (&sdev->sdev_gendev);
@@ -2527,8 +2533,8 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev)/* This is safe, since we have a reference from open(). */ __module_get (THIS_MODULE ); - pd->bdev = bdev; -set_blocksize (bdev,CD_FRAMESIZE ); + pd->bdev_handle = bdev_handle; +set_blocksize (bdev_handle->bdev,CD_FRAMESIZE );pkt_init_queue (pd);
@@ -2540,11 +2546,11 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev) }proc_create_single_data (pd->disk->disk_name,0 , pkt_proc, pkt_seq_show, pd); -dev_notice (ddev,"writer mapped to %pg\n" , bdev); +dev_notice (ddev,"writer mapped to %pg\n" , bdev_handle->bdev);return 0 ; out_mem: -blkdev_put (bdev,NULL ); +blkdev_handle_put (bdev_handle);/* This is safe: open() is still holding a reference. */ module_put (THIS_MODULE );return -ENOMEM ;
@@ -2599,9 +2605,9 @@ static unsigned int pkt_check_events(struct gendisk *disk,if (!pd)return 0 ; -if (!pd->bdev) +if (!pd->bdev_handle)return 0 ; - attached_disk = pd->bdev->bd_disk; + attached_disk = pd->bdev_handle->bdev->bd_disk;if (!attached_disk || !attached_disk->fops->check_events)return 0 ;return attached_disk->fops->check_events (attached_disk, clearing);
@@ -2686,7 +2692,7 @@ static int pkt_setup_dev(dev_t dev, dev_t* pkt_dev) goto out_mem2;/* inherit events of the host device */ - disk->events = pd->bdev->bd_disk->events; + disk->events = pd->bdev_handle->bdev->bd_disk->events; ret =add_disk (disk);if (ret)
@@ -2751,7 +2757,7 @@ static int pkt_remove_dev(dev_t pkt_dev)pkt_debugfs_dev_remove (pd);pkt_sysfs_dev_remove (pd); -blkdev_put (pd->bdev,NULL ); +blkdev_handle_put (pd->bdev_handle);remove_proc_entry (pd->disk->disk_name, pkt_proc);dev_notice (ddev,"writer unmapped\n" );
@@ -2778,7 +2784,7 @@ static void pkt_get_status(struct pkt_ctrl_command *ctrl_cmd) pd =pkt_find_dev_from_minor (ctrl_cmd->dev_index);if (pd) { - ctrl_cmd->dev =new_encode_dev (pd->bdev->bd_dev); + ctrl_cmd->dev =new_encode_dev (pd->bdev_handle->bdev->bd_dev); ctrl_cmd->pkt_dev =new_encode_dev (pd->pkt_dev); }else { ctrl_cmd->dev =0 ;
include/linux/pktcdvd.h +3 -1
@@ -154,7 +154,9 @@ struct packet_stacked_datastruct pktcdvd_device { -struct block_device *bdev;/* dev attached */ +struct bdev_handle *bdev_handle;/* dev attached */ +/* handle acquired for bdev during pkt_open_dev() */ +struct bdev_handle *open_bdev_handle;dev_t pkt_dev;/* our dev */ struct packet_settings settings;struct packet_stats stats;
Signature · 1 line
2.35.3
Jan Kara
reviewerPATCH 7/32 rnbd-srv: Convert to use blkdev_get_handle_by_path()
In reply to Jan KaraConvert rnbd-srv to use blkdev_get_handle_by_path() and pass the handle around.
--- drivers/block/rnbd/rnbd-srv.c | 28 +++++++++++++++------------- drivers/block/rnbd/rnbd-srv.h | 2 +- 2 files changed, 16 insertions(+), 14 deletions(-)
drivers/block/rnbd/rnbd-srv.c +15 -13
@@ -145,7 +145,7 @@ static int process_rdma(struct rnbd_srv_session *srv_sess, priv->sess_dev = sess_dev; priv->id = id; - bio =bio_alloc (sess_dev->bdev,1 , + bio =bio_alloc (sess_dev->bdev_handle->bdev,1 ,rnbd_to_bio_flags (le32_to_cpu (msg->rw)),GFP_KERNEL );if (bio_add_page (bio,virt_to_page (data), datalen,offset_in_page (data)) != datalen) {
@@ -219,7 +219,7 @@ void rnbd_destroy_sess_dev(struct rnbd_srv_sess_dev *sess_dev, bool keep_id)rnbd_put_sess_dev (sess_dev);wait_for_completion (&dc);/* wait for inflights to drop to zero */ -blkdev_put (sess_dev->bdev,NULL ); +blkdev_handle_put (sess_dev->bdev_handle);mutex_lock (&sess_dev->dev->lock);list_del (&sess_dev->dev_list);if (!sess_dev->readonly)
@@ -534,7 +534,7 @@ rnbd_srv_get_or_create_srv_dev(struct block_device *bdev,static void rnbd_srv_fill_msg_open_rsp (struct rnbd_msg_open_rsp *rsp,struct rnbd_srv_sess_dev *sess_dev) { -struct block_device *bdev = sess_dev->bdev; +struct block_device *bdev = sess_dev->bdev_handle->bdev; rsp->hdr.type =cpu_to_le16 (RNBD_MSG_OPEN_RSP ); rsp->device_id =cpu_to_le32 (sess_dev->device_id);
@@ -559,7 +559,7 @@ static void rnbd_srv_fill_msg_open_rsp(struct rnbd_msg_open_rsp *rsp,static struct rnbd_srv_sess_dev *rnbd_srv_create_set_sess_dev (struct rnbd_srv_session *srv_sess,const struct rnbd_msg_open *open_msg, -struct block_device *bdev,bool readonly, +struct bdev_handle *handle,bool readonly,struct rnbd_srv_dev *srv_dev) {struct rnbd_srv_sess_dev *sdev =rnbd_sess_dev_alloc (srv_sess);
@@ -571,7 +571,7 @@ rnbd_srv_create_set_sess_dev(struct rnbd_srv_session *srv_sess,strscpy (sdev->pathname, open_msg->dev_name,sizeof (sdev->pathname)); - sdev->bdev = bdev; + sdev->bdev_handle = handle; sdev->sess = srv_sess; sdev->dev = srv_dev; sdev->readonly = readonly;
@@ -676,7 +676,7 @@ static int process_msg_open(struct rnbd_srv_session *srv_sess,struct rnbd_srv_dev *srv_dev;struct rnbd_srv_sess_dev *srv_sess_dev;const struct rnbd_msg_open *open_msg = msg; -struct block_device *bdev; +struct bdev_handle *bdev_handle;blk_mode_t open_flags =BLK_OPEN_READ ;char *full_path;struct rnbd_msg_open_rsp *rsp = data;
@@ -714,15 +714,16 @@ static int process_msg_open(struct rnbd_srv_session *srv_sess, goto reject; } - bdev =blkdev_get_by_path (full_path, open_flags,NULL ,NULL ); -if (IS_ERR (bdev)) { - ret =PTR_ERR (bdev); + bdev_handle =blkdev_get_handle_by_path (full_path, open_flags,NULL , +NULL ); +if (IS_ERR (bdev_handle)) { + ret =PTR_ERR (bdev_handle);pr_err ("Opening device '%s' on session %s failed, failed to open the block device, err: %d\n" , full_path, srv_sess->sessname, ret); goto free_path; } - srv_dev =rnbd_srv_get_or_create_srv_dev (bdev, srv_sess, + srv_dev =rnbd_srv_get_or_create_srv_dev (bdev_handle->bdev, srv_sess, open_msg->access_mode);if (IS_ERR (srv_dev)) { pr_err("Opening device '%s' on session %s failed, creating srv_dev failed, err: %ld\n",
@@ -731,7 +732,8 @@ static int process_msg_open(struct rnbd_srv_session *srv_sess, goto blkdev_put; } - srv_sess_dev =rnbd_srv_create_set_sess_dev (srv_sess, open_msg, bdev, + srv_sess_dev =rnbd_srv_create_set_sess_dev (srv_sess, open_msg, + bdev_handle, open_msg->access_mode ==RNBD_ACCESS_RO , srv_dev);if (IS_ERR (srv_sess_dev)) {
@@ -747,7 +749,7 @@ static int process_msg_open(struct rnbd_srv_session *srv_sess,*/ mutex_lock (&srv_dev->lock);if (!srv_dev->dev_kobj.state_in_sysfs) { - ret =rnbd_srv_create_dev_sysfs (srv_dev, bdev); + ret =rnbd_srv_create_dev_sysfs (srv_dev, bdev_handle->bdev);if (ret) {mutex_unlock (&srv_dev->lock); rnbd_srv_err(srv_sess_dev,
@@ -790,7 +792,7 @@ static int process_msg_open(struct rnbd_srv_session *srv_sess, }rnbd_put_srv_dev (srv_dev); blkdev_put: -blkdev_put (bdev,NULL ); +blkdev_handle_put (bdev_handle); free_path:kfree (full_path); reject:
drivers/block/rnbd/rnbd-srv.h +1 -1
@@ -46,7 +46,7 @@ struct rnbd_srv_dev {struct rnbd_srv_sess_dev {/* Entry inside rnbd_srv_dev struct */ struct list_head dev_list; -struct block_device *bdev; +struct bdev_handle *bdev_handle;struct rnbd_srv_session *sess;struct rnbd_srv_dev *dev;struct kobject kobj;
Signature · 1 line
2.35.3
Re: [PATCH 07/32] rnbd-srv: Convert to use blkdev_get_handle_by_path()
Quoted 7 lines · Jan Kara
Convert rnbd-srv to use
blkdev_get_handle_by_path()and pass the handle around.CC Jack Wang <[email protected]>CC "Md. Haris Iqbal" <[email protected]>Signed-off-by Jan Kara <[email protected]>
Thanks
Quoted 128 lines
--- drivers/block/rnbd/rnbd-srv.c | 28 +++++++++++++++------------- drivers/block/rnbd/rnbd-srv.h | 2 +- 2 files changed, 16 insertions(+), 14 deletions(-)drivers/block/rnbd/rnbd-srv.c +15
-13@@ -145,7 +145,7 @@ static int process_rdma(struct rnbd_srv_session *srv_sess, priv->sess_dev = sess_dev; priv->id = id; - bio =bio_alloc (sess_dev->bdev,1 , + bio =bio_alloc (sess_dev->bdev_handle->bdev,1 ,rnbd_to_bio_flags (le32_to_cpu (msg->rw)),GFP_KERNEL );if (bio_add_page (bio,virt_to_page (data), datalen,offset_in_page (data)) != datalen) {@@ -219,7 +219,7 @@ void rnbd_destroy_sess_dev(struct rnbd_srv_sess_dev *sess_dev, bool keep_id)rnbd_put_sess_dev (sess_dev);wait_for_completion (&dc);/* wait for inflights to drop to zero */ -blkdev_put (sess_dev->bdev,NULL ); +blkdev_handle_put (sess_dev->bdev_handle);mutex_lock (&sess_dev->dev->lock);list_del (&sess_dev->dev_list);if (!sess_dev->readonly)@@ -534,7 +534,7 @@ rnbd_srv_get_or_create_srv_dev(struct block_device *bdev,static void rnbd_srv_fill_msg_open_rsp (struct rnbd_msg_open_rsp *rsp,struct rnbd_srv_sess_dev *sess_dev) { -struct block_device *bdev = sess_dev->bdev; +struct block_device *bdev = sess_dev->bdev_handle->bdev; rsp->hdr.type =cpu_to_le16 (RNBD_MSG_OPEN_RSP ); rsp->device_id =cpu_to_le32 (sess_dev->device_id);@@ -559,7 +559,7 @@ static void rnbd_srv_fill_msg_open_rsp(struct rnbd_msg_open_rsp *rsp,static struct rnbd_srv_sess_dev *rnbd_srv_create_set_sess_dev (struct rnbd_srv_session *srv_sess,const struct rnbd_msg_open *open_msg, -struct block_device *bdev,bool readonly, +struct bdev_handle *handle,bool readonly,struct rnbd_srv_dev *srv_dev) {struct rnbd_srv_sess_dev *sdev =rnbd_sess_dev_alloc (srv_sess);@@ -571,7 +571,7 @@ rnbd_srv_create_set_sess_dev(struct rnbd_srv_session *srv_sess,strscpy (sdev->pathname, open_msg->dev_name,sizeof (sdev->pathname)); - sdev->bdev = bdev; + sdev->bdev_handle = handle; sdev->sess = srv_sess; sdev->dev = srv_dev; sdev->readonly = readonly;@@ -676,7 +676,7 @@ static int process_msg_open(struct rnbd_srv_session *srv_sess,struct rnbd_srv_dev *srv_dev;struct rnbd_srv_sess_dev *srv_sess_dev;const struct rnbd_msg_open *open_msg = msg; -struct block_device *bdev; +struct bdev_handle *bdev_handle;blk_mode_t open_flags =BLK_OPEN_READ ;char *full_path;struct rnbd_msg_open_rsp *rsp = data;@@ -714,15 +714,16 @@ static int process_msg_open(struct rnbd_srv_session *srv_sess, goto reject; } - bdev =blkdev_get_by_path (full_path, open_flags,NULL ,NULL ); -if (IS_ERR (bdev)) { - ret =PTR_ERR (bdev); + bdev_handle =blkdev_get_handle_by_path (full_path, open_flags,NULL , +NULL ); +if (IS_ERR (bdev_handle)) { + ret =PTR_ERR (bdev_handle);pr_err ("Opening device '%s' on session %s failed, failed to open the block device, err: %d\n" , full_path, srv_sess->sessname, ret); goto free_path; } - srv_dev =rnbd_srv_get_or_create_srv_dev (bdev, srv_sess, + srv_dev =rnbd_srv_get_or_create_srv_dev (bdev_handle->bdev, srv_sess, open_msg->access_mode);if (IS_ERR (srv_dev)) { pr_err("Opening device '%s' on session %s failed, creating srv_dev failed, err: %ld\n",@@ -731,7 +732,8 @@ static int process_msg_open(struct rnbd_srv_session *srv_sess, goto blkdev_put; } - srv_sess_dev =rnbd_srv_create_set_sess_dev (srv_sess, open_msg, bdev, + srv_sess_dev =rnbd_srv_create_set_sess_dev (srv_sess, open_msg, + bdev_handle, open_msg->access_mode ==RNBD_ACCESS_RO , srv_dev);if (IS_ERR (srv_sess_dev)) {@@ -747,7 +749,7 @@ static int process_msg_open(struct rnbd_srv_session *srv_sess,*/ mutex_lock (&srv_dev->lock);if (!srv_dev->dev_kobj.state_in_sysfs) { - ret =rnbd_srv_create_dev_sysfs (srv_dev, bdev); + ret =rnbd_srv_create_dev_sysfs (srv_dev, bdev_handle->bdev);if (ret) {mutex_unlock (&srv_dev->lock); rnbd_srv_err(srv_sess_dev,@@ -790,7 +792,7 @@ static int process_msg_open(struct rnbd_srv_session *srv_sess, }rnbd_put_srv_dev (srv_dev); blkdev_put: -blkdev_put (bdev,NULL ); +blkdev_handle_put (bdev_handle); free_path:kfree (full_path); reject:drivers/block/rnbd/rnbd-srv.h +1
-2@@ -46,7 +46,7 @@ struct rnbd_srv_dev {struct rnbd_srv_sess_dev {/* Entry inside rnbd_srv_dev struct */ struct list_head dev_list; -struct block_device *bdev; +struct bdev_handle *bdev_handle;struct rnbd_srv_session *sess;struct rnbd_srv_dev *dev;struct kobject kobj; --2.35.3
Jan Kara
reviewerPATCH 8/32 xen/blkback: Convert to blkdev_get_handle_by_dev()
In reply to Jan KaraConvert xen/blkback to use blkdev_get_handle_by_dev() and pass the handle around.
--- drivers/block/xen-blkback/blkback.c | 4 +-- drivers/block/xen-blkback/common.h | 4 +-- drivers/block/xen-blkback/xenbus.c | 40 +++++++++++++++-------------- 3 files changed, 25 insertions(+), 23 deletions(-)
drivers/block/xen-blkback/blkback.c +2 -2
@@ -465,7 +465,7 @@ static int xen_vbd_translate(struct phys_req *req, struct xen_blkif *blkif, } req->dev = vbd->pdevice; - req->bdev = vbd->bdev; + req->bdev = vbd->bdev_handle->bdev; rc =0 ; out:
@@ -969,7 +969,7 @@ static int dispatch_discard_io(struct xen_blkif_ring *ring,int err =0 ;int status =BLKIF_RSP_OKAY ;struct xen_blkif *blkif = ring->blkif; -struct block_device *bdev = blkif->vbd.bdev; +struct block_device *bdev = blkif->vbd.bdev_handle->bdev;struct phys_req preq;xen_blkif_get (blkif);
drivers/block/xen-blkback/common.h +2 -2
@@ -221,7 +221,7 @@ struct xen_vbd {unsigned char type;/* phys device that this vbd maps to. */ u32 pdevice; -struct block_device *bdev; +struct bdev_handle *bdev_handle;/* Cached size parameter. */ sector_t size; unsigned int flush_support:1;
@@ -360,7 +360,7 @@ struct pending_req { }; -#define vbd_sz (_v) bdev_nr_sectors((_v)->bdev) +#define vbd_sz (_v) bdev_nr_sectors((_v)->bdev_handle->bdev)#define xen_blkif_get (_b) (atomic_inc(&(_b)->refcnt))#define xen_blkif_put (_b) \
drivers/block/xen-blkback/xenbus.c +21 -19
@@ -81,7 +81,7 @@ static void xen_update_blkif_status(struct xen_blkif *blkif)int i;/* Not ready to connect? */ -if (!blkif->rings || !blkif->rings[0 ].irq || !blkif->vbd.bdev) +if (!blkif->rings || !blkif->rings[0 ].irq || !blkif->vbd.bdev_handle)return ;/* Already connected? */
@@ -99,12 +99,13 @@ static void xen_update_blkif_status(struct xen_blkif *blkif)return ; } - err =sync_blockdev (blkif->vbd.bdev); + err =sync_blockdev (blkif->vbd.bdev_handle->bdev);if (err) {xenbus_dev_error (blkif->be->dev, err,"block flush" );return ; } -invalidate_inode_pages2 (blkif->vbd.bdev->bd_inode->i_mapping); +invalidate_inode_pages2 ( + blkif->vbd.bdev_handle->bdev->bd_inode->i_mapping);for (i =0 ; i < blkif->nr_rings; i++) { ring = &blkif->rings[i];
@@ -472,9 +473,9 @@ static void xenvbd_sysfs_delif(struct xenbus_device *dev)static void xen_vbd_free (struct xen_vbd *vbd) { -if (vbd->bdev) -blkdev_put (vbd->bdev,NULL ); - vbd->bdev =NULL ; +if (vbd->bdev_handle) +blkdev_handle_put (vbd->bdev_handle); + vbd->bdev_handle =NULL ; } static int xen_vbd_create(struct xen_blkif *blkif, blkif_vdev_t handle,
@@ -482,7 +483,7 @@ static int xen_vbd_create(struct xen_blkif *blkif, blkif_vdev_t handle, int cdrom) {struct xen_vbd *vbd; -struct block_device *bdev; +struct bdev_handle *bdev_handle; vbd = &blkif->vbd; vbd->handle = handle;
@@ -491,17 +492,17 @@ static int xen_vbd_create(struct xen_blkif *blkif, blkif_vdev_t handle, vbd->pdevice =MKDEV (major, minor); - bdev =blkdev_get_by_dev (vbd->pdevice, vbd->readonly ? + bdev_handle =blkdev_get_handle_by_dev (vbd->pdevice, vbd->readonly ?BLK_OPEN_READ :BLK_OPEN_WRITE ,NULL ,NULL ); -if (IS_ERR (bdev)) { +if (IS_ERR (bdev_handle)) {pr_warn ("xen_vbd_create: device %08x could not be opened\n" , vbd->pdevice);return -ENOENT ; } - vbd->bdev = bdev; -if (vbd->bdev->bd_disk ==NULL ) { + vbd->bdev_handle = bdev_handle; +if (vbd->bdev_handle->bdev->bd_disk ==NULL ) {pr_warn ("xen_vbd_create: device %08x doesn't exist\n" , vbd->pdevice);xen_vbd_free (vbd);
@@ -509,14 +510,14 @@ static int xen_vbd_create(struct xen_blkif *blkif, blkif_vdev_t handle, } vbd->size =vbd_sz (vbd); -if (cdrom ||disk_to_cdi (vbd->bdev->bd_disk)) +if (cdrom ||disk_to_cdi (vbd->bdev_handle->bdev->bd_disk)) vbd->type |=VDISK_CDROM ; -if (vbd->bdev->bd_disk->flags &GENHD_FL_REMOVABLE ) +if (vbd->bdev_handle->bdev->bd_disk->flags &GENHD_FL_REMOVABLE ) vbd->type |=VDISK_REMOVABLE ; -if (bdev_write_cache (bdev)) +if (bdev_write_cache (bdev_handle->bdev)) vbd->flush_support = true; -if (bdev_max_secure_erase_sectors (bdev)) +if (bdev_max_secure_erase_sectors (bdev_handle->bdev)) vbd->discard_secure = true; pr_debug("Successful creation of handle=%04x (dom=%u)\n",
@@ -569,7 +570,7 @@ static void xen_blkbk_discard(struct xenbus_transaction xbt, struct backend_infostruct xen_blkif *blkif = be->blkif;int err;int state =0 ; -struct block_device *bdev = be->blkif->vbd.bdev; +struct block_device *bdev = be->blkif->vbd.bdev_handle->bdev;if (!xenbus_read_unsigned (dev->nodename,"discard-enable" ,1 ))return ;
@@ -930,15 +931,16 @@ static void connect(struct backend_info *be) goto abort; } err =xenbus_printf (xbt, dev->nodename,"sector-size" ,"%lu" , - (unsigned long ) -bdev_logical_block_size (be->blkif->vbd.bdev)); + (unsigned long )bdev_logical_block_size ( + be->blkif->vbd.bdev_handle->bdev));if (err) {xenbus_dev_fatal (dev, err,"writing %s/sector-size" , dev->nodename); goto abort; } err =xenbus_printf (xbt, dev->nodename,"physical-sector-size" ,"%u" , -bdev_physical_block_size (be->blkif->vbd.bdev)); +bdev_physical_block_size ( + be->blkif->vbd.bdev_handle->bdev));if (err)xenbus_dev_error (dev, err,"writing %s/physical-sector-size" , dev->nodename);
Signature · 1 line
2.35.3
Jan Kara
reviewerPATCH 9/32 zram: Convert to use blkdev_get_handle_by_dev()
In reply to Jan KaraConvert zram to use blkdev_get_handle_by_dev() and pass the handle around.
--- drivers/block/zram/zram_drv.c | 31 ++++++++++++++----------------- drivers/block/zram/zram_drv.h | 2 +- 2 files changed, 15 insertions(+), 18 deletions(-)
drivers/block/zram/zram_drv.c +14 -17
@@ -414,17 +414,14 @@ static ssize_t writeback_limit_show(struct device *dev,static void reset_bdev (struct zram *zram) { -struct block_device *bdev; -if (!zram->backing_dev)return ; - bdev = zram->bdev; -blkdev_put (bdev, zram); +blkdev_handle_put (zram->bdev_handle);/* hope filp_close flush all of IO */ filp_close (zram->backing_dev,NULL ); zram->backing_dev =NULL ; - zram->bdev =NULL ; + zram->bdev_handle =NULL ; zram->disk->fops = &zram_devops;kvfree (zram->bitmap); zram->bitmap =NULL ;
@@ -470,7 +467,7 @@ static ssize_t backing_dev_store(struct device *dev,struct address_space *mapping;unsigned int bitmap_sz;unsigned long nr_pages, *bitmap =NULL ; -struct block_device *bdev =NULL ; +struct bdev_handle *bdev_handle =NULL ;int err;struct zram *zram =dev_to_zram (dev);
@@ -507,11 +504,11 @@ static ssize_t backing_dev_store(struct device *dev, goto out; } - bdev =blkdev_get_by_dev (inode->i_rdev,BLK_OPEN_READ |BLK_OPEN_WRITE , - zram,NULL ); -if (IS_ERR (bdev)) { - err =PTR_ERR (bdev); - bdev =NULL ; + bdev_handle =blkdev_get_handle_by_dev (inode->i_rdev, +BLK_OPEN_READ |BLK_OPEN_WRITE , zram,NULL ); +if (IS_ERR (bdev_handle)) { + err =PTR_ERR (bdev_handle); + bdev_handle =NULL ; goto out; }
@@ -525,7 +522,7 @@ static ssize_t backing_dev_store(struct device *dev,reset_bdev (zram); - zram->bdev = bdev; + zram->bdev_handle = bdev_handle; zram->backing_dev = backing_dev; zram->bitmap = bitmap; zram->nr_pages = nr_pages;
@@ -538,8 +535,8 @@ static ssize_t backing_dev_store(struct device *dev, out:kvfree (bitmap); -if (bdev) -blkdev_put (bdev, zram); +if (bdev_handle) +blkdev_handle_put (bdev_handle);if (backing_dev)filp_close (backing_dev,NULL );
@@ -581,7 +578,7 @@ static void read_from_bdev_async(struct zram *zram, struct page *page, {struct bio *bio; - bio =bio_alloc (zram->bdev,1 , parent->bi_opf,GFP_NOIO ); + bio =bio_alloc (zram->bdev_handle->bdev,1 , parent->bi_opf,GFP_NOIO ); bio->bi_iter.bi_sector = entry * (PAGE_SIZE >>9 );__bio_add_page (bio, page,PAGE_SIZE ,0 );bio_chain (bio, parent);
@@ -697,7 +694,7 @@ static ssize_t writeback_store(struct device *dev,continue ; } -bio_init (&bio, zram->bdev, &bio_vec,1 , +bio_init (&bio, zram->bdev_handle->bdev, &bio_vec,1 ,REQ_OP_WRITE |REQ_SYNC ); bio.bi_iter.bi_sector = blk_idx * (PAGE_SIZE >>9 );__bio_add_page (&bio, page,PAGE_SIZE ,0 );
@@ -779,7 +776,7 @@ static void zram_sync_read(struct work_struct *work)struct bio_vec bv;struct bio bio; -bio_init (&bio, zw->zram->bdev, &bv,1 ,REQ_OP_READ ); +bio_init (&bio, zw->zram->bdev_handle->bdev, &bv,1 ,REQ_OP_READ ); bio.bi_iter.bi_sector = zw->entry * (PAGE_SIZE >>9 );__bio_add_page (&bio, zw->page,PAGE_SIZE ,0 ); zw->error =submit_bio_wait (&bio);
drivers/block/zram/zram_drv.h +1 -1
@@ -132,7 +132,7 @@ struct zram {spinlock_t wb_limit_lock;bool wb_limit_enable;u64 bd_wb_limit; -struct block_device *bdev; +struct bdev_handle *bdev_handle;unsigned long *bitmap;unsigned long nr_pages;#endif
Signature · 1 line
2.35.3
Re: [PATCH 09/32] zram: Convert to use blkdev_get_handle_by_dev()
Quoted 7 lines · Jan Kara
Convert zram to use
blkdev_get_handle_by_dev()and pass the handle around.CC Minchan Kim <[email protected]>CC Sergey Senozhatsky <[email protected]>Signed-off-by Jan Kara <[email protected]>
FWIW,
Jan Kara
reviewerPATCH 10/32 bcache: Convert to blkdev_get_handle_by_path()
In reply to Jan KaraConvert bcache to use blkdev_get_handle_by_path() and pass the handle around.
--- drivers/md/bcache/bcache.h | 2 + drivers/md/bcache/super.c | 79 ++++++++++++++++++++------------------ 2 files changed, 44 insertions(+), 37 deletions(-)
drivers/md/bcache/bcache.h +2 -0
@@ -299,6 +299,7 @@ struct cached_dev {struct list_head list;struct bcache_device disk;struct block_device *bdev; +struct bdev_handle *bdev_handle;struct cache_sb sb;struct cache_sb_disk *sb_disk;
@@ -421,6 +422,7 @@ struct cache {struct kobject kobj;struct block_device *bdev; +struct bdev_handle *bdev_handle;struct task_struct *alloc_thread;
drivers/md/bcache/super.c +42 -37
212 lines not on this page · raw message
Signature · 1 line
2.35.3
Re: [PATCH 10/32] bcache: Convert to blkdev_get_handle_by_path()
Quoted 11 lines
2023年7月4日 20:21,Jan Kara <[email protected]> 写道:
Convert bcache to use
blkdev_get_handle_by_path()and pass the handle around.CC Coly Li <[email protected]CC Kent Overstreet <[email protected]>Signed-off-by Jan Kara <[email protected]>
Thanks.
Coly Li
Quoted 261 lines
---
drivers/md/bcache/bcache.h| 2 +drivers/md/bcache/super.c| 79 ++++++++++++++++++++------------------2 files changed, 44 insertions(+), 37 deletions(-)drivers/md/bcache/bcache.h +2
-0@@ -299,6 +299,7 @@ struct cached_dev {struct list_head list;struct bcache_device disk;struct block_device *bdev; +struct bdev_handle *bdev_handle;struct cache_sb sb;struct cache_sb_disk *sb_disk;@@ -421,6 +422,7 @@ struct cache {struct kobject kobj;struct block_device *bdev; +struct bdev_handle *bdev_handle;struct task_struct *alloc_thread;drivers/md/bcache/super.c +10
-8@@ -1368,8 +1368,8 @@ static void cached_dev_free(struct closure *cl)if (dc->sb_disk)put_page (virt_to_page (dc->sb_disk)); -if (!IS_ERR_OR_NULL (dc->bdev)) -blkdev_put (dc->bdev, dc); +if (dc->bdev_handle) +blkdev_handle_put (dc->bdev_handle);wake_up (&unregister_wait);@@ -1444,7 +1444,7 @@ static int cached_dev_init(struct cached_dev *dc, unsigned int block_size)/* Cached device - bcache superblock */ static int register_bdev (struct cache_sb *sb,struct cache_sb_disk *sb_disk, -struct block_device *bdev, +struct bdev_handle *bdev_handle,struct cached_dev *dc) {const char *err ="cannot allocate memory" ;@@ -1452,14 +1452,15 @@ static int register_bdev(struct cache_sb *sb, struct cache_sb_disk *sb_disk,int ret = -ENOMEM ;memcpy (&dc->sb, sb,sizeof (struct cache_sb )); - dc->bdev = bdev; + dc->bdev_handle = bdev_handle; + dc->bdev = bdev_handle->bdev; dc->sb_disk = sb_disk;if (cached_dev_init (dc, sb->block_size <<9 )) goto err; err ="error creating kobject" ; -if (kobject_add (&dc->disk.kobj,bdev_kobj (bdev),"bcache" )) +if (kobject_add (&dc->disk.kobj,bdev_kobj (dc->bdev),"bcache" )) goto err;if (bch_cache_accounting_add_kobjs (&dc->accounting, &dc->disk.kobj)) goto err;@@ -2216,8 +2217,8 @@ void bch_cache_release(struct kobject *kobj)if (ca->sb_disk)put_page (virt_to_page (ca->sb_disk)); -if (!IS_ERR_OR_NULL (ca->bdev)) -blkdev_put (ca->bdev, ca); +if (ca->bdev_handle) +blkdev_handle_put (ca->bdev_handle);kfree (ca);module_put (THIS_MODULE );@@ -2337,16 +2338,18 @@ static int cache_alloc(struct cache *ca) }static int register_cache (struct cache_sb *sb,struct cache_sb_disk *sb_disk, -struct block_device *bdev,struct cache *ca) +struct bdev_handle *bdev_handle, +struct cache *ca) {const char *err = NULL; /* must be set for any error case */ int ret = 0;
memcpy(&ca->sb, sb, sizeof(struct cache_sb));
-ca->bdev= bdev;
+ca->bdev_handle=bdev_handle;
+ca->bdev=bdev_handle->bdev;ca->sb_disk=sb_disk;- if (bdev_max_discard_sectors((bdev)))
+ if (bdev_max_discard_sectors((bdev_handle->bdev)))ca->discard=CACHE_DISCARD(&ca->sb);ret =
cache_alloc(ca);drivers/md/bcache/super.c +5
-5@@ -2354,10 +2357,10 @@ static int register_cache(struct cache_sb *sb, struct cache_sb_disk *sb_disk,/* * If we failed here, it means ca->kobj is not initialized yet, * kobject_put() won't be called and there is no chance to -* call blkdev_put() to bdev in bch_cache_release(). So we -* explicitly call blkdev_put() here. +* call blkdev_handle_put() to bdev in bch_cache_release(). So +* we explicitly call blkdev_handle_put() here. */ -blkdev_put (bdev, ca); +blkdev_handle_put (bdev_handle);if (ret == -ENOMEM ) err ="cache_alloc(): -ENOMEM" ;else if (ret == -EPERM )@@ -2367,7 +2370,7 @@ static int register_cache(struct cache_sb *sb, struct cache_sb_disk *sb_disk, goto err; } -if (kobject_add (&ca->kobj,bdev_kobj (bdev),"bcache" )) { +if (kobject_add (&ca->kobj,bdev_kobj (bdev_handle->bdev),"bcache" )) { err ="error calling kobject_add" ; ret = -ENOMEM ; goto out;@@ -2382,14 +2385,14 @@ static int register_cache(struct cache_sb *sb, struct cache_sb_disk *sb_disk, goto out; } -pr_info ("registered cache device %pg\n" , ca->bdev); +pr_info ("registered cache device %pg\n" , ca->bdev_handle->bdev);out:
kobject_put(&ca->kobj);err:
if (err)
-pr_notice("error %pg: %s\n", ca->bdev, err);
+pr_notice("error %pg: %s\n", ca->bdev_handle->bdev, err);return ret;
}drivers/md/bcache/super.c +21
-19@@ -2445,7 +2448,7 @@ struct async_reg_args {char *path;struct cache_sb *sb;struct cache_sb_disk *sb_disk; -struct block_device *bdev; +struct bdev_handle *bdev_handle;void *holder; };@@ -2456,8 +2459,8 @@ static void register_bdev_worker(struct work_struct *work) container_of(work, struct async_reg_args, reg_work.work);mutex_lock (&bch_register_lock); -if (register_bdev (args->sb, args->sb_disk, args->bdev, args->holder) - <0 ) +if (register_bdev (args->sb, args->sb_disk, args->bdev_handle, + args->holder) <0 ) fail = true;mutex_unlock (&bch_register_lock);@@ -2477,7 +2480,8 @@ static void register_cache_worker(struct work_struct *work) container_of(work, struct async_reg_args, reg_work.work);/* blkdev_put() will be called in bch_cache_release() */ -if (register_cache (args->sb, args->sb_disk, args->bdev, args->holder)) +if (register_cache (args->sb, args->sb_disk, args->bdev_handle, + args->holder)) fail = true;if (fail)@@ -2514,7 +2518,7 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr,char *path =NULL ;struct cache_sb *sb;struct cache_sb_disk *sb_disk; -struct block_device *bdev, *bdev2; +struct bdev_handle *bdev_handle, *bdev_handle2;void *holder =NULL ;ssize_t ret;bool async_registration = false;@@ -2547,15 +2551,16 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr, ret = -EINVAL ; err ="failed to open device" ; - bdev =blkdev_get_by_path (strim (path),BLK_OPEN_READ ,NULL ,NULL ); -if (IS_ERR (bdev)) + bdev_handle =blkdev_get_handle_by_path (strim (path),BLK_OPEN_READ , +NULL ,NULL ); +if (IS_ERR (bdev_handle)) goto out_free_sb; err ="failed to set blocksize" ; -if (set_blocksize (bdev,4096 )) +if (set_blocksize (bdev_handle->bdev,4096 )) goto out_blkdev_put; - err =read_super (sb, bdev, &sb_disk); + err =read_super (sb, bdev_handle->bdev, &sb_disk);if (err) goto out_blkdev_put;@@ -2567,13 +2572,13 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr, }/* Now reopen in exclusive mode with proper holder */ - bdev2 =blkdev_get_by_dev (bdev->bd_dev,BLK_OPEN_READ |BLK_OPEN_WRITE , - holder,NULL ); -blkdev_put (bdev,NULL ); - bdev = bdev2; -if (IS_ERR (bdev)) { - ret =PTR_ERR (bdev); - bdev =NULL ; + bdev_handle2 =blkdev_get_handle_by_dev (bdev_handle->bdev->bd_dev, +BLK_OPEN_READ |BLK_OPEN_WRITE , holder,NULL ); +blkdev_handle_put (bdev_handle); + bdev_handle = bdev_handle2; +if (IS_ERR (bdev_handle)) { + ret =PTR_ERR (bdev_handle); + bdev_handle =NULL ;if (ret == -EBUSY ) {dev_t dev;@@ -2608,7 +2613,7 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr, args->path = path; args->sb = sb; args->sb_disk = sb_disk; - args->bdev = bdev; + args->bdev_handle = bdev_handle; args->holder = holder;register_device_async (args);/* No wait and returns to user space */ @@ -2617,14 +2622,14 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr,if (SB_IS_BDEV (sb)) {mutex_lock (&bch_register_lock); - ret =register_bdev (sb, sb_disk, bdev, holder); + ret =register_bdev (sb, sb_disk, bdev_handle, holder);mutex_unlock (&bch_register_lock);/* blkdev_put() will be called in cached_dev_free() */ if (ret <0 ) goto out_free_sb; }else {/* blkdev_put() will be called in bch_cache_release() */ - ret =register_cache (sb, sb_disk, bdev, holder); + ret =register_cache (sb, sb_disk, bdev_handle, holder);if (ret) goto out_free_sb; }@@ -2640,8 +2645,8 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr,
out_put_sb_page:
put_page(virt_to_page(sb_disk));out_blkdev_put:
- if (bdev)
-blkdev_put(bdev, holder);
+ if (bdev_handle)
+blkdev_handle_put(bdev_handle);out_free_sb:
kfree(sb);out_free_path:Signature · 1 line
2.35.3
Jan Kara
reviewerPATCH 11/32 dm: Convert to blkdev_get_handle_by_dev()
In reply to Jan KaraConvert device mapper to use blkdev_get_handle_by_dev() and pass the handle around.
--- drivers/md/dm.c | 20 +++++++++++--------- include/linux/device-mapper.h | 1 + 2 files changed, 12 insertions(+), 9 deletions(-)
drivers/md/dm.c +11 -9
@@ -742,7 +742,7 @@ static struct table_device *open_table_device(struct mapped_device *md, dev_t dev, blk_mode_t mode) {struct table_device *td; -struct block_device *bdev; +struct bdev_handle *bdev_handle;u64 part_off;int r;
@@ -751,9 +751,9 @@ static struct table_device *open_table_device(struct mapped_device *md,return ERR_PTR (-ENOMEM );refcount_set (&td->count,1 ); - bdev =blkdev_get_by_dev (dev, mode, _dm_claim_ptr,NULL ); -if (IS_ERR (bdev)) { - r =PTR_ERR (bdev); + bdev_handle =blkdev_get_handle_by_dev (dev, mode, _dm_claim_ptr,NULL ); +if (IS_ERR (bdev_handle)) { + r =PTR_ERR (bdev_handle); goto out_free_td; }
@@ -763,20 +763,22 @@ static struct table_device *open_table_device(struct mapped_device *md,* called. */ if (md->disk->slave_dir) { - r =bd_link_disk_holder (bdev, md->disk); + r =bd_link_disk_holder (bdev_handle->bdev, md->disk);if (r) goto out_blkdev_put; } td->dm_dev.mode = mode; - td->dm_dev.bdev = bdev; - td->dm_dev.dax_dev =fs_dax_get_by_bdev (bdev, &part_off,NULL ,NULL ); + td->dm_dev.bdev = bdev_handle->bdev; + td->dm_dev.bdev_handle = bdev_handle; + td->dm_dev.dax_dev =fs_dax_get_by_bdev (bdev_handle->bdev, &part_off, +NULL ,NULL );format_dev_t (td->dm_dev.name, dev);list_add (&td->list, &md->table_devices);return td; out_blkdev_put: -blkdev_put (bdev, _dm_claim_ptr); +blkdev_handle_put (bdev_handle); out_free_td:kfree (td);return ERR_PTR (r);
@@ -789,7 +791,7 @@ static void close_table_device(struct table_device *td, struct mapped_device *md {if (md->disk->slave_dir)bd_unlink_disk_holder (td->dm_dev.bdev, md->disk); -blkdev_put (td->dm_dev.bdev, _dm_claim_ptr); +blkdev_handle_put (td->dm_dev.bdev_handle);put_dax (td->dm_dev.dax_dev);list_del (&td->list);kfree (td);
include/linux/device-mapper.h +1 -0
@@ -165,6 +165,7 @@ void dm_error(const char *message);struct dm_dev {struct block_device *bdev; +struct bdev_handle *bdev_handle;struct dax_device *dax_dev;blk_mode_t mode;char name[16 ];
Signature · 1 line
2.35.3
Jan Kara
reviewerPATCH 12/32 md: Convert to blkdev_get_handle_by_dev()
In reply to Jan KaraConvert md to use blkdev_get_handle_by_dev() and pass the handle around.
--- drivers/md/md.c | 12 +++++++----- drivers/md/md.h | 1 + 2 files changed, 8 insertions(+), 5 deletions(-)
drivers/md/md.c +7 -5
@@ -2458,7 +2458,7 @@ static void export_rdev(struct md_rdev *rdev, struct mddev *mddev)if (test_bit (AutoDetected, &rdev->flags))md_autodetect_dev (rdev->bdev->bd_dev);#endif -blkdev_put (rdev->bdev, mddev->major_version ==-2 ? &claim_rdev : rdev); +blkdev_handle_put (rdev->bdev_handle); rdev->bdev =NULL ;kobject_put (&rdev->kobj); }
@@ -3654,14 +3654,16 @@ static struct md_rdev *md_import_device(dev_t newdev, int super_format, int supeif (err) goto out_clear_rdev; - rdev->bdev =blkdev_get_by_dev (newdev,BLK_OPEN_READ |BLK_OPEN_WRITE , + rdev->bdev_handle =blkdev_get_handle_by_dev (newdev, +BLK_OPEN_READ |BLK_OPEN_WRITE , super_format ==-2 ? &claim_rdev : rdev,NULL ); -if (IS_ERR (rdev->bdev)) { +if (IS_ERR (rdev->bdev_handle)) {pr_warn ("md: could not open device unknown-block(%u,%u).\n" ,MAJOR (newdev),MINOR (newdev)); - err =PTR_ERR (rdev->bdev); + err =PTR_ERR (rdev->bdev_handle); goto out_clear_rdev; } + rdev->bdev = rdev->bdev_handle->bdev;kobject_init (&rdev->kobj, &rdev_ktype);
@@ -3692,7 +3694,7 @@ static struct md_rdev *md_import_device(dev_t newdev, int super_format, int supereturn rdev; out_blkdev_put: -blkdev_put (rdev->bdev, super_format ==-2 ? &claim_rdev : rdev); +blkdev_handle_put (rdev->bdev_handle); out_clear_rdev:md_rdev_clear (rdev); out_free_rdev:
drivers/md/md.h +1 -0
@@ -59,6 +59,7 @@ struct md_rdev {*/ struct block_device *meta_bdev;struct block_device *bdev;/* block device handle */ +struct bdev_handle *bdev_handle;/* Handle from open for bdev */ struct page *sb_page, *bb_page;int sb_loaded;
Signature · 1 line
2.35.3
Jan Kara
reviewerPATCH 13/32 mtd: block2mtd: Convert to blkdev_get_handle_by_dev/path()
In reply to Jan KaraConvert block2mtd to use blkdev_get_handle_by_dev() and blkdev_get_handle_by_path() and pass the handle around.
--- drivers/mtd/devices/block2mtd.c | 52 +++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 22 deletions(-)
drivers/mtd/devices/block2mtd.c +30 -22
@@ -37,7 +37,7 @@/* Info for the block device */ struct block2mtd_dev {struct list_head list; -struct block_device *blkdev; +struct bdev_handle *bdev_handle;struct mtd_info mtd;struct mutex write_mutex; };
@@ -55,7 +55,8 @@ static struct page *page_read(struct address_space *mapping, pgoff_t index)/* erase a specified part of the device */ static int _block2mtd_erase (struct block2mtd_dev *dev,loff_t to,size_t len) { -struct address_space *mapping = dev->blkdev->bd_inode->i_mapping; +struct address_space *mapping = + dev->bdev_handle->bdev->bd_inode->i_mapping;struct page *page;pgoff_t index = to >>PAGE_SHIFT ;// page index int pages = len >>PAGE_SHIFT ;
@@ -105,6 +106,8 @@ static int block2mtd_read(struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf) { struct block2mtd_dev *dev = mtd->priv; +struct address_space *mapping = + dev->bdev_handle->bdev->bd_inode->i_mapping;struct page *page;pgoff_t index = from >>PAGE_SHIFT ;int offset = from & (PAGE_SIZE -1 );
@@ -117,7 +120,7 @@ static int block2mtd_read(struct mtd_info *mtd, loff_t from, size_t len, cpylen = len;// this page len = len - cpylen; - page =page_read (dev->blkdev->bd_inode->i_mapping, index); + page =page_read (mapping, index);if (IS_ERR (page))return PTR_ERR (page);
@@ -139,7 +142,8 @@ static int _block2mtd_write(struct block2mtd_dev *dev, const u_char *buf, loff_t to, size_t len, size_t *retlen) { struct page *page; -struct address_space *mapping = dev->blkdev->bd_inode->i_mapping; +struct address_space *mapping = + dev->bdev_handle->bdev->bd_inode->i_mapping;pgoff_t index = to >>PAGE_SHIFT ;// page index int offset = to & ~PAGE_MASK ;// page offset int cpylen;
@@ -194,7 +198,7 @@ static int block2mtd_write(struct mtd_info *mtd, loff_t to, size_t len,static void block2mtd_sync (struct mtd_info *mtd) {struct block2mtd_dev *dev = mtd->priv; -sync_blockdev (dev->blkdev); +sync_blockdev (dev->bdev_handle->bdev);return ; }
@@ -206,10 +210,10 @@ static void block2mtd_free_device(struct block2mtd_dev *dev)kfree (dev->mtd.name); -if (dev->blkdev) { -invalidate_mapping_pages (dev->blkdev->bd_inode->i_mapping, -0 ,-1 ); -blkdev_put (dev->blkdev,NULL ); +if (dev->bdev_handle) { +invalidate_mapping_pages ( + dev->bdev_handle->bdev->bd_inode->i_mapping,0 ,-1 ); +blkdev_handle_put (dev->bdev_handle); }kfree (dev);
@@ -219,10 +223,10 @@ static void block2mtd_free_device(struct block2mtd_dev *dev)* This function is marked __ref because it calls the __init marked * early_lookup_bdev when called from the early boot code. */ -static struct block_device __ref *mdtblock_early_get_bdev (const char *devname, +static struct bdev_handle __ref *mdtblock_early_get_bdev (const char *devname,blk_mode_t mode,int timeout,struct block2mtd_dev *dev) { -struct block_device *bdev =ERR_PTR (-ENODEV ); +struct bdev_handle *bdev_handle =ERR_PTR (-ENODEV );#ifndef MODULE int i;
@@ -230,7 +234,7 @@ static struct block_device __ref *mdtblock_early_get_bdev(const char *devname,* We can't use early_lookup_bdev from a running system. */ if (system_state >=SYSTEM_RUNNING ) -return bdev; +return bdev_handle;/* * We might not have the root device mounted at this point.
@@ -249,19 +253,21 @@ static struct block_device __ref *mdtblock_early_get_bdev(const char *devname,wait_for_device_probe ();if (!early_lookup_bdev (devname, &devt)) { - bdev =blkdev_get_by_dev (devt, mode, dev,NULL ); -if (!IS_ERR (bdev)) + bdev_handle =blkdev_get_handle_by_dev (devt, mode, dev, +NULL ); +if (!IS_ERR (bdev_handle))break ; } }#endif -return bdev; +return bdev_handle; }static struct block2mtd_dev *add_device (char *devname,int erase_size,char *label,int timeout) {const blk_mode_t mode =BLK_OPEN_READ |BLK_OPEN_WRITE ; +struct bdev_handle *bdev_handle;struct block_device *bdev;struct block2mtd_dev *dev;char *name;
@@ -274,21 +280,23 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size,return NULL ;/* Get a handle on the device */ - bdev =blkdev_get_by_path (devname, mode, dev,NULL ); -if (IS_ERR (bdev)) - bdev =mdtblock_early_get_bdev (devname, mode, timeout, dev); -if (IS_ERR (bdev)) { + bdev_handle =blkdev_get_handle_by_path (devname, mode, dev,NULL ); +if (IS_ERR (bdev_handle)) + bdev_handle =mdtblock_early_get_bdev (devname, mode, timeout, + dev); +if (IS_ERR (bdev_handle)) {pr_err ("error: cannot open device %s\n" , devname); goto err_free_block2mtd; } - dev->blkdev = bdev; + dev->bdev_handle = bdev_handle; + bdev = bdev_handle->bdev;if (MAJOR (bdev->bd_dev) ==MTD_BLOCK_MAJOR ) {pr_err ("attempting to use an MTD device as a block device\n" ); goto err_free_block2mtd; } -if ((long )dev->blkdev->bd_inode->i_size % erase_size) { +if ((long )bdev->bd_inode->i_size % erase_size) {pr_err ("erasesize must be a divisor of device size\n" ); goto err_free_block2mtd; }
@@ -306,7 +314,7 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size, dev->mtd.name = name; - dev->mtd.size = dev->blkdev->bd_inode->i_size &PAGE_MASK ; + dev->mtd.size = bdev->bd_inode->i_size &PAGE_MASK ; dev->mtd.erasesize = erase_size; dev->mtd.writesize =1 ; dev->mtd.writebufsize =PAGE_SIZE ;
Signature · 1 line
2.35.3
Jan Kara
reviewerPATCH 14/32 nvmet: Convert to blkdev_get_handle_by_path()
In reply to Jan KaraConvert nvmet to use blkdev_get_handle_by_path() and pass the handle around.
--- drivers/nvme/target/io-cmd-bdev.c | 20 +++++++++++--------- drivers/nvme/target/nvmet.h | 1 + 2 files changed, 12 insertions(+), 9 deletions(-)
drivers/nvme/target/io-cmd-bdev.c +11 -9
@@ -50,9 +50,10 @@ void nvmet_bdev_set_limits(struct block_device *bdev, struct nvme_id_ns *id)void nvmet_bdev_ns_disable (struct nvmet_ns *ns) { -if (ns->bdev) { -blkdev_put (ns->bdev,NULL ); +if (ns->bdev_handle) { +blkdev_handle_put (ns->bdev_handle); ns->bdev =NULL ; + ns->bdev_handle =NULL ; } }
@@ -84,17 +85,18 @@ int nvmet_bdev_ns_enable(struct nvmet_ns *ns)if (ns->buffered_io)return -ENOTBLK ; - ns->bdev =blkdev_get_by_path (ns->device_path, -BLK_OPEN_READ |BLK_OPEN_WRITE ,NULL ,NULL ); -if (IS_ERR (ns->bdev)) { - ret =PTR_ERR (ns->bdev); + ns->bdev_handle =blkdev_get_handle_by_path (ns->device_path, +BLK_OPEN_READ |BLK_OPEN_WRITE ,NULL ,NULL ); +if (IS_ERR (ns->bdev_handle)) { + ret =PTR_ERR (ns->bdev_handle);if (ret != -ENOTBLK ) { -pr_err ("failed to open block device %s: (%ld)\n" , - ns->device_path,PTR_ERR (ns->bdev)); +pr_err ("failed to open block device %s: (%d)\n" , + ns->device_path, ret); } - ns->bdev =NULL ; + ns->bdev_handle =NULL ;return ret; } + ns->bdev = ns->bdev_handle->bdev; ns->size =bdev_nr_bytes (ns->bdev); ns->blksize_shift =blksize_bits (bdev_logical_block_size (ns->bdev));
drivers/nvme/target/nvmet.h +1 -0
@@ -58,6 +58,7 @@struct nvmet_ns {struct percpu_ref ref; +struct bdev_handle *bdev_handle;struct block_device *bdev;struct file *file;bool readonly;
Signature · 1 line
2.35.3
Jan Kara
reviewerPATCH 15/32 s390/dasd: Convert to blkdev_get_handle_by_path()
In reply to Jan KaraConvert dasd to use blkdev_get_handle_by_path() and pass the handle around.
--- drivers/s390/block/dasd.c | 12 +++++---- drivers/s390/block/dasd_genhd.c | 45 ++++++++++++++++----------------- drivers/s390/block/dasd_int.h | 2 +- drivers/s390/block/dasd_ioctl.c | 2 +- 4 files changed, 31 insertions(+), 30 deletions(-)
drivers/s390/block/dasd.c +7 -5
@@ -412,7 +412,8 @@ dasd_state_ready_to_online(struct dasd_device * device) KOBJ_CHANGE);return 0 ; } -disk_uevent (device->block->bdev->bd_disk,KOBJ_CHANGE ); +disk_uevent (device->block->bdev_handle->bdev->bd_disk, +KOBJ_CHANGE ); }return 0 ; }
@@ -432,7 +433,8 @@ static int dasd_state_online_to_ready(struct dasd_device *device) device->state =DASD_STATE_READY ;if (device->block && !(device->features &DASD_FEATURE_USERAW )) -disk_uevent (device->block->bdev->bd_disk,KOBJ_CHANGE ); +disk_uevent (device->block->bdev_handle->bdev->bd_disk, +KOBJ_CHANGE );return 0 ; }
@@ -3580,7 +3582,7 @@ int dasd_generic_set_offline(struct ccw_device *cdev)* in the other openers. */ if (device->block) { - max_count = device->block->bdev ?0 :-1 ; + max_count = device->block->bdev_handle ?0 :-1 ; open_count =atomic_read (&device->block->open_count);if (open_count > max_count) {if (open_count >0 )
@@ -3626,8 +3628,8 @@ int dasd_generic_set_offline(struct ccw_device *cdev)* so sync bdev first and then wait for our queues to become * empty */ -if (device->block) { - rc =fsync_bdev (device->block->bdev); +if (device->block && device->block->bdev_handle) { + rc =fsync_bdev (device->block->bdev_handle->bdev);if (rc !=0 ) goto interrupted; }
drivers/s390/block/dasd_genhd.c +22 -23
74 lines not on this page · raw message
drivers/s390/block/dasd_int.h +1 -1
@@ -646,7 +646,7 @@ struct dasd_block {struct gendisk *gdp;spinlock_t request_queue_lock;struct blk_mq_tag_set tag_set; -struct block_device *bdev; +struct bdev_handle *bdev_handle;atomic_t open_count;unsigned long blocks;/* size of volume in blocks */
drivers/s390/block/dasd_ioctl.c +1 -1
@@ -536,7 +536,7 @@ static int __dasd_ioctl_information(struct dasd_block *block,* This must be hidden from user-space. */ dasd_info->open_count =atomic_read (&block->open_count); -if (!block->bdev) +if (!block->bdev_handle) dasd_info->open_count++;/*
Signature · 1 line
2.35.3
Jan Kara
reviewerPATCH 16/32 scsi: target: Convert to blkdev_get_handle_by_path()
In reply to Jan KaraConvert iblock and pscsi drivers to use blkdev_get_handle_by_path() and pass the handle around.
--- drivers/target/target_core_iblock.c | 19 +++++++++++-------- drivers/target/target_core_iblock.h | 1 + drivers/target/target_core_pscsi.c | 26 +++++++++++++------------- drivers/target/target_core_pscsi.h | 2 +- 4 files changed, 26 insertions(+), 22 deletions(-)
drivers/target/target_core_iblock.c +11 -8
@@ -91,7 +91,8 @@ static int iblock_configure_device(struct se_device *dev) {struct iblock_dev *ib_dev =IBLOCK_DEV (dev);struct request_queue *q; -struct block_device *bd =NULL ; +struct bdev_handle *bdev_handle; +struct block_device *bd;struct blk_integrity *bi;blk_mode_t mode =BLK_OPEN_READ ;unsigned int max_write_zeroes_sectors;
@@ -116,12 +117,14 @@ static int iblock_configure_device(struct se_device *dev)else dev->dev_flags |=DF_READ_ONLY ; - bd =blkdev_get_by_path (ib_dev->ibd_udev_path, mode, ib_dev,NULL ); -if (IS_ERR (bd)) { - ret =PTR_ERR (bd); + bdev_handle =blkdev_get_handle_by_path (ib_dev->ibd_udev_path, mode, + ib_dev,NULL ); +if (IS_ERR (bdev_handle)) { + ret =PTR_ERR (bdev_handle); goto out_free_bioset; } - ib_dev->ibd_bd = bd; + ib_dev->ibd_bdev_handle = bdev_handle; + ib_dev->ibd_bd = bd = bdev_handle->bdev; q =bdev_get_queue (bd);
@@ -177,7 +180,7 @@ static int iblock_configure_device(struct se_device *dev)return 0 ; out_blkdev_put: -blkdev_put (ib_dev->ibd_bd, ib_dev); +blkdev_handle_put (ib_dev->ibd_bdev_handle); out_free_bioset:bioset_exit (&ib_dev->ibd_bio_set); out:
@@ -202,8 +205,8 @@ static void iblock_destroy_device(struct se_device *dev) {struct iblock_dev *ib_dev =IBLOCK_DEV (dev); -if (ib_dev->ibd_bd !=NULL ) -blkdev_put (ib_dev->ibd_bd, ib_dev); +if (ib_dev->ibd_bdev_handle) +blkdev_handle_put (ib_dev->ibd_bdev_handle);bioset_exit (&ib_dev->ibd_bio_set); }
drivers/target/target_core_iblock.h +1 -0
@@ -32,6 +32,7 @@ struct iblock_dev {u32 ibd_flags;struct bio_set ibd_bio_set;struct block_device *ibd_bd; +struct bdev_handle *ibd_bdev_handle;bool ibd_readonly;struct iblock_dev_plug *ibd_plug; }____cacheline_aligned ;
drivers/target/target_core_pscsi.c +13 -13
@@ -352,7 +352,7 @@ static int pscsi_create_type_disk(struct se_device *dev, struct scsi_device *sd)struct pscsi_hba_virt *phv = dev->se_hba->hba_ptr;struct pscsi_dev_virt *pdv =PSCSI_DEV (dev);struct Scsi_Host *sh = sd->host; -struct block_device *bd; +struct bdev_handle *bdev_handle;int ret;if (scsi_device_get (sd)) {
@@ -366,18 +366,18 @@ static int pscsi_create_type_disk(struct se_device *dev, struct scsi_device *sd)* Claim exclusive struct block_device access to struct scsi_device * for TYPE_DISK and TYPE_ZBC using supplied udev_path */ - bd =blkdev_get_by_path (dev->udev_path,BLK_OPEN_WRITE |BLK_OPEN_READ , - pdv,NULL ); -if (IS_ERR (bd)) { -pr_err ("pSCSI: blkdev_get_by_path() failed\n" ); + bdev_handle =blkdev_get_handle_by_path (dev->udev_path, +BLK_OPEN_WRITE |BLK_OPEN_READ , pdv,NULL ); +if (IS_ERR (bdev_handle)) { +pr_err ("pSCSI: blkdev_get_handle_by_path() failed\n" );scsi_device_put (sd); -return PTR_ERR (bd); +return PTR_ERR (bdev_handle); } - pdv->pdv_bd = bd; + pdv->pdv_bdev_handle = bdev_handle; ret =pscsi_add_device_to_list (dev, sd);if (ret) { -blkdev_put (pdv->pdv_bd, pdv); +blkdev_handle_put (bdev_handle);scsi_device_put (sd);return ret; }
@@ -564,9 +564,9 @@ static void pscsi_destroy_device(struct se_device *dev)* from pscsi_create_type_disk() */ if ((sd->type ==TYPE_DISK || sd->type ==TYPE_ZBC ) && - pdv->pdv_bd) { -blkdev_put (pdv->pdv_bd, pdv); - pdv->pdv_bd =NULL ; + pdv->pdv_bdev_handle) { +blkdev_handle_put (pdv->pdv_bdev_handle); + pdv->pdv_bdev_handle =NULL ; }/* * For HBA mode PHV_LLD_SCSI_HOST_NO, release the reference
@@ -994,8 +994,8 @@ static sector_t pscsi_get_blocks(struct se_device *dev) {struct pscsi_dev_virt *pdv =PSCSI_DEV (dev); -if (pdv->pdv_bd) -return bdev_nr_sectors (pdv->pdv_bd); +if (pdv->pdv_bdev_handle) +return bdev_nr_sectors (pdv->pdv_bdev_handle->bdev);return 0 ; }
drivers/target/target_core_pscsi.h +1 -1
@@ -37,7 +37,7 @@ struct pscsi_dev_virt {int pdv_channel_id;int pdv_target_id;int pdv_lun_id; -struct block_device *pdv_bd; +struct bdev_handle *pdv_bdev_handle;struct scsi_device *pdv_sd;struct Scsi_Host *pdv_lld_host; }____cacheline_aligned ;
Signature · 1 line
2.35.3
Jan Kara
reviewerPATCH 17/32 PM: hibernate: Convert to blkdev_get_handle_by_dev()
In reply to Jan KaraConvert hibernation code to use blkdev_get_handle_by_dev().
--- kernel/power/swap.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-)
kernel/power/swap.c +16 -15
@@ -222,7 +222,7 @@ int swsusp_swap_in_use(void)*/ static unsigned short root_swap =0xffff ; -static struct block_device *hib_resume_bdev; +static struct bdev_handle *hib_resume_bdev_handle;struct hib_bio_batch {atomic_t count;
@@ -276,7 +276,8 @@ static int hib_submit_io(blk_opf_t opf, pgoff_t page_off, void *addr,struct bio *bio;int error =0 ; - bio =bio_alloc (hib_resume_bdev,1 , opf,GFP_NOIO | __GFP_HIGH); + bio =bio_alloc (hib_resume_bdev_handle->bdev,1 , opf, +GFP_NOIO | __GFP_HIGH); bio->bi_iter.bi_sector = page_off * (PAGE_SIZE >>9 );if (bio_add_page (bio, page,PAGE_SIZE ,0 ) <PAGE_SIZE ) {
@@ -356,14 +357,14 @@ static int swsusp_swap_check(void)return res; root_swap = res; - hib_resume_bdev =blkdev_get_by_dev (swsusp_resume_device, + hib_resume_bdev_handle =blkdev_get_handle_by_dev (swsusp_resume_device,BLK_OPEN_WRITE ,NULL ,NULL ); -if (IS_ERR (hib_resume_bdev)) -return PTR_ERR (hib_resume_bdev); +if (IS_ERR (hib_resume_bdev_handle)) +return PTR_ERR (hib_resume_bdev_handle); - res =set_blocksize (hib_resume_bdev,PAGE_SIZE ); + res =set_blocksize (hib_resume_bdev_handle->bdev,PAGE_SIZE );if (res <0 ) -blkdev_put (hib_resume_bdev,NULL ); +blkdev_handle_put (hib_resume_bdev_handle);return res; }
@@ -1521,10 +1522,10 @@ int swsusp_check(bool snapshot_test)void *holder = snapshot_test ? &swsusp_holder :NULL ;int error; - hib_resume_bdev =blkdev_get_by_dev (swsusp_resume_device,BLK_OPEN_READ , - holder,NULL ); -if (!IS_ERR (hib_resume_bdev)) { -set_blocksize (hib_resume_bdev,PAGE_SIZE ); + hib_resume_bdev_handle =blkdev_get_handle_by_dev (swsusp_resume_device, +BLK_OPEN_READ , holder,NULL ); +if (!IS_ERR (hib_resume_bdev_handle)) { +set_blocksize (hib_resume_bdev_handle->bdev,PAGE_SIZE );clear_page (swsusp_header); error =hib_submit_io (REQ_OP_READ , swsusp_resume_block, swsusp_header,NULL );
@@ -1549,11 +1550,11 @@ int swsusp_check(bool snapshot_test) put:if (error) -blkdev_put (hib_resume_bdev, holder); +blkdev_handle_put (hib_resume_bdev_handle);else pr_debug ("Image signature found, resuming\n" ); }else { - error =PTR_ERR (hib_resume_bdev); + error =PTR_ERR (hib_resume_bdev_handle); }if (error)
@@ -1568,12 +1569,12 @@ int swsusp_check(bool snapshot_test)void swsusp_close (bool snapshot_test) { -if (IS_ERR (hib_resume_bdev)) { +if (IS_ERR (hib_resume_bdev_handle)) {pr_debug ("Image device not initialised\n" );return ; } -blkdev_put (hib_resume_bdev, snapshot_test ? &swsusp_holder :NULL ); +blkdev_handle_put (hib_resume_bdev_handle); }/**
Signature · 1 line
2.35.3
Jan Kara
reviewerPATCH 18/32 PM: hibernate: Drop unused snapshot_test argument
In reply to Jan Karasnapshot_test argument is now unused in swsusp_close() and load_image_and_restore(). Drop it
--- kernel/power/hibernate.c | 14 +++++++------- kernel/power/power.h | 2 +- kernel/power/swap.c | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-)
kernel/power/hibernate.c +7 -7
@@ -684,7 +684,7 @@ static void power_down(void)cpu_relax (); } -static int load_image_and_restore (bool snapshot_test) +static int load_image_and_restore (void ) {int error;unsigned int flags;
@@ -694,12 +694,12 @@ static int load_image_and_restore(bool snapshot_test)lock_device_hotplug (); error =create_basic_memory_bitmaps ();if (error) { -swsusp_close (snapshot_test); +swsusp_close (); goto Unlock; } error =swsusp_read (&flags); -swsusp_close (snapshot_test); +swsusp_close ();if (!error) error =hibernation_restore (flags &SF_PLATFORM_MODE );
@@ -788,7 +788,7 @@ int hibernate(void)pm_pr_dbg ("Checking hibernation image\n" ); error =swsusp_check (snapshot_test);if (!error) - error =load_image_and_restore (snapshot_test); + error =load_image_and_restore (); }thaw_processes ();
@@ -952,7 +952,7 @@ static int software_resume(void)/* The snapshot device should not be opened while we're running */ if (!hibernate_acquire ()) { error = -EBUSY ; -swsusp_close (false); +swsusp_close (); goto Unlock; }
@@ -973,7 +973,7 @@ static int software_resume(void) goto Close_Finish; } - error =load_image_and_restore (false); + error =load_image_and_restore ();thaw_processes (); Finish:pm_notifier_call_chain (PM_POST_RESTORE );
@@ -987,7 +987,7 @@ static int software_resume(void)pm_pr_dbg ("Hibernation image not present or could not be loaded.\n" );return error; Close_Finish: -swsusp_close (false); +swsusp_close (); goto Finish; }
kernel/power/power.h +1 -1
@@ -172,7 +172,7 @@ int swsusp_check(bool snapshot_test);extern void swsusp_free (void );extern int swsusp_read (unsigned int *flags_p);extern int swsusp_write (unsigned int flags); -void swsusp_close (bool snapshot_test); +void swsusp_close (void );#ifdef CONFIG_SUSPEND extern int swsusp_unmark (void );#endif
kernel/power/swap.c +3 -3
@@ -444,7 +444,7 @@ static int get_swap_writer(struct swap_map_handle *handle) err_rel:release_swap_writer (handle); err_close: -swsusp_close (false); +swsusp_close ();return ret; }
@@ -509,7 +509,7 @@ static int swap_writer_finish(struct swap_map_handle *handle,if (error)free_all_swap_pages (root_swap);release_swap_writer (handle); -swsusp_close (false); +swsusp_close ();return error; }
@@ -1567,7 +1567,7 @@ int swsusp_check(bool snapshot_test)* swsusp_close - close swap device. */ -void swsusp_close (bool snapshot_test) +void swsusp_close (void ) {if (IS_ERR (hib_resume_bdev_handle)) {pr_debug ("Image device not initialised\n" );
Signature · 1 line
2.35.3
Jan Kara
reviewerPATCH 19/32 mm/swap: Convert to use blkdev_get_handle_by_dev()
In reply to Jan KaraConvert swapping code to use blkdev_get_handle_by_dev() and pass the handle around.
--- include/linux/swap.h | 1 + mm/swapfile.c | 21 ++++++++++----------- 2 files changed, 11 insertions(+), 11 deletions(-)
include/linux/swap.h +1 -0
@@ -298,6 +298,7 @@ struct swap_info_struct {unsigned int __percpu *cluster_next_cpu;/*percpu index for next allocation */ struct percpu_cluster __percpu *percpu_cluster;/* per cpu's swap location */ struct rb_root swap_extent_root;/* root of the swap extent rbtree */ +struct bdev_handle *bdev_handle;/* open handle of the bdev */ struct block_device *bdev;/* swap device or bdev of swap file */ struct file *swap_file;/* seldom referenced */ unsigned int old_block_size;/* seldom referenced */
mm/swapfile.c +10 -11
@@ -2526,11 +2526,9 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)exit_swap_address_space (p->type); inode = mapping->host; -if (S_ISBLK (inode->i_mode)) { -struct block_device *bdev =I_BDEV (inode); - -set_blocksize (bdev, old_block_size); -blkdev_put (bdev, p); +if (p->bdev_handle) { +set_blocksize (p->bdev, old_block_size); +blkdev_handle_put (p->bdev_handle); }inode_lock (inode);
@@ -2760,13 +2758,14 @@ static int claim_swapfile(struct swap_info_struct *p, struct inode *inode)int error;if (S_ISBLK (inode->i_mode)) { - p->bdev =blkdev_get_by_dev (inode->i_rdev, + p->bdev_handle =blkdev_get_handle_by_dev (inode->i_rdev,BLK_OPEN_READ |BLK_OPEN_WRITE , p,NULL ); -if (IS_ERR (p->bdev)) { - error =PTR_ERR (p->bdev); - p->bdev =NULL ; +if (IS_ERR (p->bdev_handle)) { + error =PTR_ERR (p->bdev_handle); + p->bdev_handle =NULL ;return error; } + p->bdev = p->bdev_handle->bdev; p->old_block_size =block_size (p->bdev); error =set_blocksize (p->bdev,PAGE_SIZE );if (error <0 )
@@ -3210,9 +3209,9 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) p->percpu_cluster =NULL ;free_percpu (p->cluster_next_cpu); p->cluster_next_cpu =NULL ; -if (inode &&S_ISBLK (inode->i_mode) && p->bdev) { +if (p->bdev_handle) {set_blocksize (p->bdev, p->old_block_size); -blkdev_put (p->bdev, p); +blkdev_handle_put (p->bdev_handle); } inode =NULL ;destroy_swap_extents (p);
Signature · 1 line
2.35.3
Jan Kara
reviewerPATCH 20/32 fs: Convert to blkdev_get_handle_by_path()
In reply to Jan KaraConvert mount code to use blkdev_get_handle_by_path() and propagate the handle around to blkdev_handle_put().
--- fs/super.c | 52 ++++++++++++++++++++++++++-------------------- include/linux/fs.h | 1 + 2 files changed, 31 insertions(+), 22 deletions(-)
fs/super.c +30 -22
@@ -1228,7 +1228,8 @@ static const struct blk_holder_ops fs_holder_ops = {static int set_bdev_super (struct super_block *s,void *data) { - s->s_bdev = data; + s->s_bdev_handle = data; + s->s_bdev = s->s_bdev_handle->bdev; s->s_dev = s->s_bdev->bd_dev; s->s_bdi =bdi_get (s->s_bdev->bd_disk->bdi);
@@ -1244,7 +1245,8 @@ static int set_bdev_super_fc(struct super_block *s, struct fs_context *fc)static int test_bdev_super_fc (struct super_block *s,struct fs_context *fc) { -return !(s->s_iflags &SB_I_RETIRED ) && s->s_bdev == fc->sget_key; +return !(s->s_iflags &SB_I_RETIRED ) && + s->s_bdev == ((struct bdev_handle *)fc->sget_key)->bdev; }/**
@@ -1256,6 +1258,7 @@ int get_tree_bdev(struct fs_context *fc,int (*fill_super)(struct super_block *, struct fs_context *)) { +struct bdev_handle *bdev_handle;struct block_device *bdev;struct super_block *s;int error =0 ;
@@ -1263,12 +1266,14 @@ int get_tree_bdev(struct fs_context *fc,if (!fc->source)return invalf (fc,"No source specified" ); - bdev =blkdev_get_by_path (fc->source,sb_open_mode (fc->sb_flags), - fc->fs_type, &fs_holder_ops); -if (IS_ERR (bdev)) { + bdev_handle =blkdev_get_handle_by_path (fc->source, +sb_open_mode (fc->sb_flags), fc->fs_type, + &fs_holder_ops); +if (IS_ERR (bdev_handle)) {errorf (fc,"%s: Can't open blockdev" , fc->source); -return PTR_ERR (bdev); +return PTR_ERR (bdev_handle); } + bdev = bdev_handle->bdev;/* Once the superblock is inserted into the list by sget_fc(), s_umount * will protect the lockfs code from trying to start a snapshot while
@@ -1278,16 +1283,16 @@ int get_tree_bdev(struct fs_context *fc,if (bdev->bd_fsfreeze_count >0 ) {mutex_unlock (&bdev->bd_fsfreeze_mutex);warnf (fc,"%pg: Can't mount, blockdev is frozen" , bdev); -blkdev_put (bdev, fc->fs_type); +blkdev_handle_put (bdev_handle);return -EBUSY ; } fc->sb_flags |=SB_NOSEC ; - fc->sget_key = bdev; + fc->sget_key = bdev_handle; s =sget_fc (fc, test_bdev_super_fc, set_bdev_super_fc);mutex_unlock (&bdev->bd_fsfreeze_mutex);if (IS_ERR (s)) { -blkdev_put (bdev, fc->fs_type); +blkdev_handle_put (bdev_handle);return PTR_ERR (s); }
@@ -1296,19 +1301,19 @@ int get_tree_bdev(struct fs_context *fc,if ((fc->sb_flags ^ s->s_flags) &SB_RDONLY ) {warnf (fc,"%pg: Can't mount, would change RO state" , bdev);deactivate_locked_super (s); -blkdev_put (bdev, fc->fs_type); +blkdev_handle_put (bdev_handle);return -EBUSY ; }/* * s_umount nests inside open_mutex during -* __invalidate_device(). blkdev_put() acquires +* __invalidate_device(). blkdev_handle_put() acquires * open_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); -blkdev_put (bdev, fc->fs_type); +blkdev_handle_put (bdev_handle);down_write (&s->s_umount); }else {snprintf (s->s_id,sizeof (s->s_id),"%pg" , bdev);
@@ -1333,21 +1338,24 @@ EXPORT_SYMBOL(get_tree_bdev);static int test_bdev_super (struct super_block *s,void *data) { -return !(s->s_iflags &SB_I_RETIRED ) && (void *)s->s_bdev == data; +return !(s->s_iflags &SB_I_RETIRED ) && + s->s_bdev == ((struct bdev_handle *)data)->bdev; }struct dentry *mount_bdev (struct file_system_type *fs_type,int flags,const char *dev_name,void *data,int (*fill_super)(struct super_block *,void *,int )) { +struct bdev_handle *bdev_handle;struct block_device *bdev;struct super_block *s;int error =0 ; - bdev =blkdev_get_by_path (dev_name,sb_open_mode (flags), fs_type, - &fs_holder_ops); -if (IS_ERR (bdev)) -return ERR_CAST (bdev); + bdev_handle =blkdev_get_handle_by_path (dev_name,sb_open_mode (flags), + fs_type, &fs_holder_ops); +if (IS_ERR (bdev_handle)) +return ERR_CAST (bdev_handle); + bdev = bdev_handle->bdev;/* * once the super is inserted into the list by sget, s_umount
@@ -1361,7 +1369,7 @@ struct dentry *mount_bdev(struct file_system_type *fs_type, goto error_bdev; } s =sget (fs_type, test_bdev_super, set_bdev_super, flags |SB_NOSEC , - bdev); + bdev_handle);mutex_unlock (&bdev->bd_fsfreeze_mutex);if (IS_ERR (s)) goto error_s;
@@ -1375,13 +1383,13 @@ struct dentry *mount_bdev(struct file_system_type *fs_type,/* * s_umount nests inside open_mutex during -* __invalidate_device(). blkdev_put() acquires +* __invalidate_device(). blkdev_handle_put() acquires * open_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); -blkdev_put (bdev, fs_type); +blkdev_handle_put (bdev_handle);down_write (&s->s_umount); }else {snprintf (s->s_id,sizeof (s->s_id),"%pg" , bdev);
@@ -1403,7 +1411,7 @@ struct dentry *mount_bdev(struct file_system_type *fs_type, error_s: error =PTR_ERR (s); error_bdev: -blkdev_put (bdev, fs_type); +blkdev_handle_put (bdev_handle); error:return ERR_PTR (error); }
@@ -1416,7 +1424,7 @@ void kill_block_super(struct super_block *sb) bdev->bd_super =NULL ;generic_shutdown_super (sb);sync_blockdev (bdev); -blkdev_put (bdev, sb->s_type); +blkdev_handle_put (sb->s_bdev_handle); }EXPORT_SYMBOL (kill_block_super);
include/linux/fs.h +1 -0
@@ -1187,6 +1187,7 @@ struct super_block {struct hlist_bl_head s_roots;/* alternate root dentries for NFS */ struct list_head s_mounts;/* list of mounts; _not_ for fs use */ struct block_device *s_bdev; +struct bdev_handle *s_bdev_handle;struct backing_dev_info *s_bdi;struct mtd_info *s_mtd;struct hlist_node s_instances;
Signature · 1 line
2.35.3
Jan Kara
reviewerPATCH 21/32 btrfs: Convert to blkdev_get_handle_by_path()
In reply to Jan KaraConvert btrfs to use blkdev_get_handle_by_path() and pass the handle around. We also drop the holder from struct btrfs_device as it is now not needed anymore.
--- fs/btrfs/dev-replace.c | 14 +++--- fs/btrfs/ioctl.c | 18 +++---- fs/btrfs/volumes.c | 108 +++++++++++++++++++++-------------------- fs/btrfs/volumes.h | 6 +-- 4 files changed, 74 insertions(+), 72 deletions(-)
fs/btrfs/dev-replace.c +8 -6
@@ -247,6 +247,7 @@ static int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info *fs_info, {struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;struct btrfs_device *device; +struct bdev_handle *bdev_handle;struct block_device *bdev;u64 devid =BTRFS_DEV_REPLACE_DEVID ;int ret =0 ;
@@ -257,12 +258,13 @@ static int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,return -EINVAL ; } - bdev =blkdev_get_by_path (device_path,BLK_OPEN_WRITE , - fs_info->bdev_holder,NULL ); -if (IS_ERR (bdev)) { + bdev_handle =blkdev_get_handle_by_path (device_path,BLK_OPEN_WRITE , + fs_info->bdev_holder,NULL ); +if (IS_ERR (bdev_handle)) {btrfs_err (fs_info,"target device %s is invalid!" , device_path); -return PTR_ERR (bdev); +return PTR_ERR (bdev_handle); } + bdev = bdev_handle->bdev;if (!btrfs_check_device_zone_type (fs_info, bdev)) { btrfs_err(fs_info,
@@ -313,9 +315,9 @@ static int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info *fs_info, device->commit_bytes_used = device->bytes_used; device->fs_info = fs_info; device->bdev = bdev; + device->bdev_handle = bdev_handle;set_bit (BTRFS_DEV_STATE_IN_FS_METADATA , &device->dev_state);set_bit (BTRFS_DEV_STATE_REPLACE_TGT , &device->dev_state); - device->holder = fs_info->bdev_holder; device->dev_stats_valid =1 ;set_blocksize (device->bdev,BTRFS_BDEV_BLOCKSIZE ); device->fs_devices = fs_devices;
@@ -334,7 +336,7 @@ static int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,return 0 ; error: -blkdev_put (bdev, fs_info->bdev_holder); +blkdev_handle_put (bdev_handle);return ret; }
fs/btrfs/ioctl.c +8 -10
@@ -2670,8 +2670,7 @@ static long btrfs_ioctl_rm_dev_v2(struct file *file, void __user *arg)struct inode *inode =file_inode (file);struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb);struct btrfs_ioctl_vol_args_v2 *vol_args; -struct block_device *bdev =NULL ; -void *holder; +struct bdev_handle *bdev_handle =NULL ;int ret;bool cancel = false;
@@ -2708,7 +2707,7 @@ static long btrfs_ioctl_rm_dev_v2(struct file *file, void __user *arg) goto err_drop;/* Exclusive operation is now claimed */ - ret =btrfs_rm_device (fs_info, &args, &bdev, &holder); + ret =btrfs_rm_device (fs_info, &args, &bdev_handle);btrfs_exclop_finish (fs_info);
@@ -2722,8 +2721,8 @@ static long btrfs_ioctl_rm_dev_v2(struct file *file, void __user *arg) } err_drop:mnt_drop_write_file (file); -if (bdev) -blkdev_put (bdev, holder); +if (bdev_handle) +blkdev_handle_put (bdev_handle); out:btrfs_put_dev_args_from_path (&args);kfree (vol_args);
@@ -2736,8 +2735,7 @@ static long btrfs_ioctl_rm_dev(struct file *file, void __user *arg)struct inode *inode =file_inode (file);struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb);struct btrfs_ioctl_vol_args *vol_args; -struct block_device *bdev =NULL ; -void *holder; +struct bdev_handle *bdev_handle =NULL ;int ret;bool cancel = false;
@@ -2764,15 +2762,15 @@ static long btrfs_ioctl_rm_dev(struct file *file, void __user *arg) ret =exclop_start_or_cancel_reloc (fs_info,BTRFS_EXCLOP_DEV_REMOVE , cancel);if (ret ==0 ) { - ret =btrfs_rm_device (fs_info, &args, &bdev, &holder); + ret =btrfs_rm_device (fs_info, &args, &bdev_handle);if (!ret)btrfs_info (fs_info,"disk deleted %s" , vol_args->name);btrfs_exclop_finish (fs_info); }mnt_drop_write_file (file); -if (bdev) -blkdev_put (bdev, holder); +if (bdev_handle) +blkdev_handle_put (bdev_handle); out:btrfs_put_dev_args_from_path (&args);kfree (vol_args);
fs/btrfs/volumes.c +56 -52
298 lines not on this page · raw message
fs/btrfs/volumes.h +2 -4
@@ -90,13 +90,11 @@ struct btrfs_device {u64 generation; +struct bdev_handle *bdev_handle;struct block_device *bdev;struct btrfs_zoned_device_info *zone_info; -/* block device holder for blkdev_get/put */ -void *holder; -/* * Device's major-minor number. Must be set even if the device is not * opened (bdev == NULL), unless the device is missing.
@@ -629,7 +627,7 @@ struct btrfs_device *btrfs_alloc_device(struct btrfs_fs_info *fs_info,void btrfs_put_dev_args_from_path (struct btrfs_dev_lookup_args *args);int btrfs_rm_device (struct btrfs_fs_info *fs_info,struct btrfs_dev_lookup_args *args, -struct block_device **bdev,void **holder); +struct bdev_handle **bdev_handle); void __exit btrfs_cleanup_fs_uuids(void);int btrfs_num_copies (struct btrfs_fs_info *fs_info,u64 logical,u64 len); int btrfs_grow_device(struct btrfs_trans_handle *trans,
Signature · 1 line
2.35.3
Jan Kara
reviewerPATCH 22/32 erofs: Convert to use blkdev_get_handle_by_path()
In reply to Jan KaraConvert erofs to use blkdev_get_handle_by_path() and pass the handle around.
--- fs/erofs/data.c | 4 ++-- fs/erofs/internal.h | 2 +- fs/erofs/super.c | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-)
fs/erofs/data.c +2 -2
@@ -222,7 +222,7 @@ int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *map)up_read (&devs->rwsem);return 0 ; } - map->m_bdev = dif->bdev; + map->m_bdev = dif->bdev_handle->bdev; map->m_daxdev = dif->dax_dev; map->m_dax_part_off = dif->dax_part_off; map->m_fscache = dif->fscache;
@@ -240,7 +240,7 @@ int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *map)if (map->m_pa >= startoff && map->m_pa < startoff + length) { map->m_pa -= startoff; - map->m_bdev = dif->bdev; + map->m_bdev = dif->bdev_handle->bdev; map->m_daxdev = dif->dax_dev; map->m_dax_part_off = dif->dax_part_off; map->m_fscache = dif->fscache;
fs/erofs/internal.h +1 -1
@@ -47,7 +47,7 @@ typedef u32 erofs_blk_t;struct erofs_device_info {char *path;struct erofs_fscache *fscache; -struct block_device *bdev; +struct bdev_handle *bdev_handle;struct dax_device *dax_dev;u64 dax_part_off;
fs/erofs/super.c +10 -10
@@ -230,7 +230,7 @@ static int erofs_init_device(struct erofs_buf *buf, struct super_block *sb,struct erofs_sb_info *sbi =EROFS_SB (sb);struct erofs_fscache *fscache;struct erofs_deviceslot *dis; -struct block_device *bdev; +struct bdev_handle *bdev_handle;void *ptr; ptr =erofs_read_metabuf (buf, sb,erofs_blknr (sb, *pos),EROFS_KMAP );
@@ -254,13 +254,13 @@ static int erofs_init_device(struct erofs_buf *buf, struct super_block *sb,return PTR_ERR (fscache); dif->fscache = fscache; }else if (!sbi->devs->flatdev) { - bdev =blkdev_get_by_path (dif->path,BLK_OPEN_READ , sb->s_type, -NULL ); -if (IS_ERR (bdev)) -return PTR_ERR (bdev); - dif->bdev = bdev; - dif->dax_dev =fs_dax_get_by_bdev (bdev, &dif->dax_part_off, -NULL ,NULL ); + bdev_handle =blkdev_get_handle_by_path (dif->path, +BLK_OPEN_READ , sb->s_type,NULL ); +if (IS_ERR (bdev_handle)) +return PTR_ERR (bdev_handle); + dif->bdev_handle = bdev_handle; + dif->dax_dev =fs_dax_get_by_bdev (bdev_handle->bdev, + &dif->dax_part_off,NULL ,NULL ); } dif->blocks =le32_to_cpu (dis->blocks);
@@ -815,8 +815,8 @@ static int erofs_release_device_info(int id, void *ptr, void *data)struct erofs_device_info *dif = ptr;fs_put_dax (dif->dax_dev,NULL ); -if (dif->bdev) -blkdev_put (dif->bdev, &erofs_fs_type); +if (dif->bdev_handle) +blkdev_handle_put (dif->bdev_handle);erofs_fscache_unregister_cookie (dif->fscache); dif->fscache =NULL ;kfree (dif->path);
Signature · 1 line
2.35.3
Re: [PATCH 22/32] erofs: Convert to use blkdev_get_handle_by_path()
Quoted 7 lines · Jan Kara
Convert erofs to use
blkdev_get_handle_by_path()and pass the handle around.CC Gao Xiang <[email protected]>CC Chao Yu <[email protected]>Signed-off-by Jan Kara <[email protected]>
Thanks for this:
Thanks,
Gao Xiang
Quoted 86 lines
--- fs/erofs/data.c | 4 ++-- fs/erofs/internal.h | 2 +- fs/erofs/super.c | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-)fs/erofs/data.c +2
-2@@ -222,7 +222,7 @@ int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *map)up_read (&devs->rwsem);return 0 ; } - map->m_bdev = dif->bdev; + map->m_bdev = dif->bdev_handle->bdev; map->m_daxdev = dif->dax_dev; map->m_dax_part_off = dif->dax_part_off; map->m_fscache = dif->fscache;@@ -240,7 +240,7 @@ int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *map)if (map->m_pa >= startoff && map->m_pa < startoff + length) { map->m_pa -= startoff; - map->m_bdev = dif->bdev; + map->m_bdev = dif->bdev_handle->bdev; map->m_daxdev = dif->dax_dev; map->m_dax_part_off = dif->dax_part_off; map->m_fscache = dif->fscache;fs/erofs/internal.h +1
-1@@ -47,7 +47,7 @@ typedef u32 erofs_blk_t;struct erofs_device_info {char *path;struct erofs_fscache *fscache; -struct block_device *bdev; +struct bdev_handle *bdev_handle;struct dax_device *dax_dev;u64 dax_part_off;fs/erofs/super.c +10
-10@@ -230,7 +230,7 @@ static int erofs_init_device(struct erofs_buf *buf, struct super_block *sb,struct erofs_sb_info *sbi =EROFS_SB (sb);struct erofs_fscache *fscache;struct erofs_deviceslot *dis; -struct block_device *bdev; +struct bdev_handle *bdev_handle;void *ptr; ptr =erofs_read_metabuf (buf, sb,erofs_blknr (sb, *pos),EROFS_KMAP );@@ -254,13 +254,13 @@ static int erofs_init_device(struct erofs_buf *buf, struct super_block *sb,return PTR_ERR (fscache); dif->fscache = fscache; }else if (!sbi->devs->flatdev) { - bdev =blkdev_get_by_path (dif->path,BLK_OPEN_READ , sb->s_type, -NULL ); -if (IS_ERR (bdev)) -return PTR_ERR (bdev); - dif->bdev = bdev; - dif->dax_dev =fs_dax_get_by_bdev (bdev, &dif->dax_part_off, -NULL ,NULL ); + bdev_handle =blkdev_get_handle_by_path (dif->path, +BLK_OPEN_READ , sb->s_type,NULL ); +if (IS_ERR (bdev_handle)) +return PTR_ERR (bdev_handle); + dif->bdev_handle = bdev_handle; + dif->dax_dev =fs_dax_get_by_bdev (bdev_handle->bdev, + &dif->dax_part_off,NULL ,NULL ); } dif->blocks =le32_to_cpu (dis->blocks);@@ -815,8 +815,8 @@ static int erofs_release_device_info(int id, void *ptr, void *data)struct erofs_device_info *dif = ptr;fs_put_dax (dif->dax_dev,NULL ); -if (dif->bdev) -blkdev_put (dif->bdev, &erofs_fs_type); +if (dif->bdev_handle) +blkdev_handle_put (dif->bdev_handle);erofs_fscache_unregister_cookie (dif->fscache); dif->fscache =NULL ;kfree (dif->path);
Jan Kara
reviewerPATCH 23/32 ext4: Convert to blkdev_get_handle_by_dev()
In reply to Jan KaraConvert ext4 to use blkdev_get_handle_by_dev() and pass the handle around.
--- fs/ext4/ext4.h | 2 +- fs/ext4/fsmap.c | 9 +++++---- fs/ext4/super.c | 40 ++++++++++++++++++++-------------------- 3 files changed, 26 insertions(+), 25 deletions(-)
fs/ext4/ext4.h +1 -1
@@ -1535,7 +1535,7 @@ struct ext4_sb_info {unsigned long s_commit_interval;u32 s_max_batch_time;u32 s_min_batch_time; -struct block_device *s_journal_bdev; +struct bdev_handle *s_journal_bdev_handle;#ifdef CONFIG_QUOTA /* Names of quota files with journalled quota */ char __rcu *s_qf_names[EXT4_MAXQUOTAS ];
fs/ext4/fsmap.c +5 -4
@@ -576,8 +576,9 @@ static bool ext4_getfsmap_is_valid_device(struct super_block *sb,if (fm->fmr_device ==0 || fm->fmr_device ==UINT_MAX || fm->fmr_device ==new_encode_dev (sb->s_bdev->bd_dev))return true; -if (EXT4_SB (sb)->s_journal_bdev && - fm->fmr_device ==new_encode_dev (EXT4_SB (sb)->s_journal_bdev->bd_dev)) +if (EXT4_SB (sb)->s_journal_bdev_handle && + fm->fmr_device == +new_encode_dev (EXT4_SB (sb)->s_journal_bdev_handle->bdev->bd_dev))return true;return false; }
@@ -647,9 +648,9 @@ int ext4_getfsmap(struct super_block *sb, struct ext4_fsmap_head *head,memset (handlers,0 ,sizeof (handlers)); handlers[0 ].gfd_dev =new_encode_dev (sb->s_bdev->bd_dev); handlers[0 ].gfd_fn = ext4_getfsmap_datadev; -if (EXT4_SB (sb)->s_journal_bdev) { +if (EXT4_SB (sb)->s_journal_bdev_handle) { handlers[1 ].gfd_dev =new_encode_dev ( -EXT4_SB (sb)->s_journal_bdev->bd_dev); +EXT4_SB (sb)->s_journal_bdev_handle->bdev->bd_dev); handlers[1 ].gfd_fn = ext4_getfsmap_logdev; }
fs/ext4/super.c +20 -20
@@ -1108,20 +1108,20 @@ static const struct blk_holder_ops ext4_holder_ops = {/* * Open the external journal device */ -static struct block_device *ext4_blkdev_get (dev_t dev,struct super_block *sb) +static struct bdev_handle *ext4_blkdev_get (dev_t dev,struct super_block *sb) { -struct block_device *bdev; +struct bdev_handle *handle; - bdev =blkdev_get_by_dev (dev,BLK_OPEN_READ |BLK_OPEN_WRITE , sb, - &ext4_holder_ops); -if (IS_ERR (bdev)) + handle =blkdev_get_handle_by_dev (dev,BLK_OPEN_READ |BLK_OPEN_WRITE , + sb, &ext4_holder_ops); +if (IS_ERR (handle)) goto fail; -return bdev; +return handle; fail:ext4_msg (sb,KERN_ERR ,"failed to open journal device unknown-block(%u,%u) %ld" , -MAJOR (dev),MINOR (dev),PTR_ERR (bdev)); +MAJOR (dev),MINOR (dev),PTR_ERR (handle));return NULL ; }
@@ -1130,17 +1130,15 @@ static struct block_device *ext4_blkdev_get(dev_t dev, struct super_block *sb)*/ static void ext4_blkdev_remove (struct ext4_sb_info *sbi) { -struct block_device *bdev; - bdev = sbi->s_journal_bdev; -if (bdev) { +if (sbi->s_journal_bdev_handle) {/* * Invalidate the journal device's buffers. We don't want them * floating about in memory - the physical journal device may * hotswapped, and it breaks the `ro-after' testing code. */ -invalidate_bdev (bdev); -blkdev_put (bdev, sbi->s_sb); - sbi->s_journal_bdev =NULL ; +invalidate_bdev (sbi->s_journal_bdev_handle->bdev); +blkdev_handle_put (sbi->s_journal_bdev_handle); + sbi->s_journal_bdev_handle =NULL ; } }
@@ -1338,8 +1336,8 @@ static void ext4_put_super(struct super_block *sb)sync_blockdev (sb->s_bdev);invalidate_bdev (sb->s_bdev); -if (sbi->s_journal_bdev) { -sync_blockdev (sbi->s_journal_bdev); +if (sbi->s_journal_bdev_handle) { +sync_blockdev (sbi->s_journal_bdev_handle->bdev);ext4_blkdev_remove (sbi); }
@@ -4227,7 +4225,7 @@ int ext4_calculate_overhead(struct super_block *sb)* Add the internal journal blocks whether the journal has been * loaded or not */ -if (sbi->s_journal && !sbi->s_journal_bdev) +if (sbi->s_journal && !sbi->s_journal_bdev_handle) overhead +=EXT4_NUM_B2C (sbi, sbi->s_journal->j_total_len);else if (ext4_has_feature_journal (sb) && !sbi->s_journal && j_inum) {/* j_inum for internal journal is non-zero */
@@ -5850,14 +5848,16 @@ static journal_t *ext4_get_dev_journal(struct super_block *sb,unsigned long offset;struct ext4_super_block *es;struct block_device *bdev; +struct bdev_handle *bdev_handle;if (WARN_ON_ONCE (!ext4_has_feature_journal (sb)))return NULL ; - bdev =ext4_blkdev_get (j_dev, sb); -if (bdev ==NULL ) + bdev_handle =ext4_blkdev_get (j_dev, sb); +if (!bdev_handle)return NULL ; + bdev = bdev_handle->bdev; blocksize = sb->s_blocksize; hblock =bdev_logical_block_size (bdev);if (blocksize < hblock) {
@@ -5921,14 +5921,14 @@ static journal_t *ext4_get_dev_journal(struct super_block *sb, be32_to_cpu(journal->j_superblock->s_nr_users)); goto out_journal; } -EXT4_SB (sb)->s_journal_bdev = bdev; +EXT4_SB (sb)->s_journal_bdev_handle = bdev_handle;ext4_init_journal_params (sb, journal);return journal; out_journal:jbd2_journal_destroy (journal); out_bdev: -blkdev_put (bdev, sb); +blkdev_handle_put (bdev_handle);return NULL ; }
Signature · 1 line
2.35.3
Jan Kara
reviewerPATCH 24/32 f2fs: Convert to blkdev_get_handle_by_dev/path()
In reply to Jan KaraConvert f2fs to use blkdev_get_handle_by_dev/path() and pass the handle around.
--- fs/f2fs/f2fs.h | 1 + fs/f2fs/super.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-)
fs/f2fs/f2fs.h +1 -0
@@ -1227,6 +1227,7 @@ struct f2fs_bio_info {#define FDEV (i) (sbi->devs[i])#define RDEV (i) (raw_super->devs[i])struct f2fs_dev_info { +struct bdev_handle *bdev_handle;struct block_device *bdev;char path[MAX_PATH_LEN ];unsigned int total_segments;
fs/f2fs/super.c +9 -9
@@ -1538,7 +1538,7 @@ static void destroy_device_list(struct f2fs_sb_info *sbi)int i;for (i =0 ; i < sbi->s_ndevs; i++) { -blkdev_put (FDEV (i).bdev, sbi->sb->s_type); +blkdev_handle_put (FDEV (i).bdev_handle);#ifdef CONFIG_BLK_DEV_ZONED kvfree (FDEV (i).blkz_seq);#endif
@@ -4024,9 +4024,9 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)if (max_devices ==1 ) {/* Single zoned block device mount */ -FDEV (0 ).bdev = -blkdev_get_by_dev (sbi->sb->s_bdev->bd_dev, mode, - sbi->sb->s_type,NULL ); +FDEV (0 ).bdev_handle =blkdev_get_handle_by_dev ( + sbi->sb->s_bdev->bd_dev, + mode, sbi->sb->s_type,NULL ); }else {/* Multi-device mount */ memcpy (FDEV (i).path,RDEV (i).path,MAX_PATH_LEN );
@@ -4044,13 +4044,13 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi) (FDEV (i).total_segments << sbi->log_blocks_per_seg) -1 ; } -FDEV (i).bdev =blkdev_get_by_path (FDEV (i).path, mode, - sbi->sb->s_type, -NULL ); +FDEV (i).bdev_handle =blkdev_get_handle_by_path ( +FDEV (i).path, mode, sbi->sb->s_type,NULL ); } -if (IS_ERR (FDEV (i).bdev)) -return PTR_ERR (FDEV (i).bdev); +if (IS_ERR (FDEV (i).bdev_handle)) +return PTR_ERR (FDEV (i).bdev_handle); +FDEV (i).bdev =FDEV (i).bdev_handle->bdev;/* to release errored devices */ sbi->s_ndevs = i +1 ;
Signature · 8 lines
2.35.3 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Jan Kara
reviewerPATCH 25/32 jfs: Convert to blkdev_get_handle_by_dev()
In reply to Jan KaraConvert jfs to use blkdev_get_handle_by_dev() and pass the handle around.
--- fs/jfs/jfs_logmgr.c | 29 +++++++++++++++-------------- fs/jfs/jfs_logmgr.h | 2 +- fs/jfs/jfs_mount.c | 3 ++- 3 files changed, 18 insertions(+), 16 deletions(-)
fs/jfs/jfs_logmgr.c +15 -14
@@ -1058,7 +1058,7 @@ void jfs_syncpt(struct jfs_log *log, int hard_sync)int lmLogOpen (struct super_block *sb) {int rc; -struct block_device *bdev; +struct bdev_handle *bdev_handle;struct jfs_log *log;struct jfs_sb_info *sbi =JFS_SBI (sb);
@@ -1070,7 +1070,7 @@ int lmLogOpen(struct super_block *sb)mutex_lock (&jfs_log_mutex);list_for_each_entry (log, &jfs_external_logs, journal_list) { -if (log->bdev->bd_dev == sbi->logdev) { +if (log->bdev_handle->bdev->bd_dev == sbi->logdev) {if (!uuid_equal (&log->uuid, &sbi->loguuid)) {jfs_warn ("wrong uuid on JFS journal" );mutex_unlock (&jfs_log_mutex);
@@ -1100,14 +1100,14 @@ int lmLogOpen(struct super_block *sb)* file systems to log may have n-to-1 relationship; */ - bdev =blkdev_get_by_dev (sbi->logdev,BLK_OPEN_READ |BLK_OPEN_WRITE , - log,NULL ); -if (IS_ERR (bdev)) { - rc =PTR_ERR (bdev); + bdev_handle =blkdev_get_handle_by_dev (sbi->logdev, +BLK_OPEN_READ |BLK_OPEN_WRITE , log,NULL ); +if (IS_ERR (bdev_handle)) { + rc =PTR_ERR (bdev_handle); goto free; } - log->bdev = bdev; + log->bdev_handle = bdev_handle;uuid_copy (&log->uuid, &sbi->loguuid);/*
@@ -1141,7 +1141,7 @@ int lmLogOpen(struct super_block *sb)lbmLogShutdown (log); close:/* close external log device */ -blkdev_put (bdev, log); +blkdev_handle_put (bdev_handle); free:/* free log descriptor */ mutex_unlock (&jfs_log_mutex);
@@ -1162,7 +1162,7 @@ static int open_inline_log(struct super_block *sb)init_waitqueue_head (&log->syncwait);set_bit (log_INLINELOG, &log->flag); - log->bdev = sb->s_bdev; + log->bdev_handle = sb->s_bdev_handle; log->base =addressPXD (&JFS_SBI (sb)->logpxd); log->size =lengthPXD (&JFS_SBI (sb)->logpxd) >> (L2LOGPSIZE - sb->s_blocksize_bits);
@@ -1436,7 +1436,7 @@ int lmLogClose(struct super_block *sb) {struct jfs_sb_info *sbi =JFS_SBI (sb);struct jfs_log *log = sbi->log; -struct block_device *bdev; +struct bdev_handle *bdev_handle;int rc =0 ;jfs_info ("lmLogClose: log:0x%p" , log);
@@ -1482,10 +1482,10 @@ int lmLogClose(struct super_block *sb)* external log as separate logical volume */ list_del (&log->journal_list); - bdev = log->bdev; + bdev_handle = log->bdev_handle; rc =lmLogShutdown (log); -blkdev_put (bdev, log); +blkdev_handle_put (bdev_handle);kfree (log);
@@ -1972,7 +1972,7 @@ static int lbmRead(struct jfs_log * log, int pn, struct lbuf ** bpp) bp->l_flag |= lbmREAD; - bio =bio_alloc (log->bdev,1 ,REQ_OP_READ ,GFP_NOFS ); + bio =bio_alloc (log->bdev_handle->bdev,1 ,REQ_OP_READ ,GFP_NOFS ); bio->bi_iter.bi_sector = bp->l_blkno << (log->l2bsize -9 );__bio_add_page (bio, bp->l_page,LOGPSIZE , bp->l_offset);BUG_ON (bio->bi_iter.bi_size !=LOGPSIZE );
@@ -2113,7 +2113,8 @@ static void lbmStartIO(struct lbuf * bp)jfs_info ("lbmStartIO" ); - bio =bio_alloc (log->bdev,1 ,REQ_OP_WRITE |REQ_SYNC ,GFP_NOFS ); + bio =bio_alloc (log->bdev_handle->bdev,1 ,REQ_OP_WRITE |REQ_SYNC , +GFP_NOFS ); bio->bi_iter.bi_sector = bp->l_blkno << (log->l2bsize -9 );__bio_add_page (bio, bp->l_page,LOGPSIZE , bp->l_offset);BUG_ON (bio->bi_iter.bi_size !=LOGPSIZE );
fs/jfs/jfs_logmgr.h +1 -1
@@ -356,7 +356,7 @@ struct jfs_log {* before writing syncpt. */ struct list_head journal_list;/* Global list */ -struct block_device *bdev;/* 4: log lv pointer */ +struct bdev_handle *bdev_handle;/* 4: log lv pointer */ int serial;/* 4: log mount serial number */ s64 base;/* @8: log extent address (inline log ) */
fs/jfs/jfs_mount.c +2 -1
@@ -430,7 +430,8 @@ int updateSuper(struct super_block *sb, uint state)if (state ==FM_MOUNT ) {/* record log's dev_t and mount serial number */ - j_sb->s_logdev =cpu_to_le32 (new_encode_dev (sbi->log->bdev->bd_dev)); + j_sb->s_logdev =cpu_to_le32 ( +new_encode_dev (sbi->log->bdev_handle->bdev->bd_dev)); j_sb->s_logserial =cpu_to_le32 (sbi->log->serial); }else if (state ==FM_CLEAN ) {/*
Signature · 1 line
2.35.3
Re: [PATCH 25/32] jfs: Convert to blkdev_get_handle_by_dev()
Quoted 2 lines · Jan Kara
Convert jfs to use
blkdev_get_handle_by_dev()and pass the handle around.
No problem from jfs's persepective.
Quoted 138 lines
--- fs/jfs/jfs_logmgr.c | 29 +++++++++++++++-------------- fs/jfs/jfs_logmgr.h | 2 +- fs/jfs/jfs_mount.c | 3 ++- 3 files changed, 18 insertions(+), 16 deletions(-)fs/jfs/jfs_logmgr.c +15
-14@@ -1058,7 +1058,7 @@ void jfs_syncpt(struct jfs_log *log, int hard_sync)int lmLogOpen (struct super_block *sb) {int rc; -struct block_device *bdev; +struct bdev_handle *bdev_handle;struct jfs_log *log;struct jfs_sb_info *sbi =JFS_SBI (sb);@@ -1070,7 +1070,7 @@ int lmLogOpen(struct super_block *sb)mutex_lock (&jfs_log_mutex);list_for_each_entry (log, &jfs_external_logs, journal_list) { -if (log->bdev->bd_dev == sbi->logdev) { +if (log->bdev_handle->bdev->bd_dev == sbi->logdev) {if (!uuid_equal (&log->uuid, &sbi->loguuid)) {jfs_warn ("wrong uuid on JFS journal" );mutex_unlock (&jfs_log_mutex);@@ -1100,14 +1100,14 @@ int lmLogOpen(struct super_block *sb)* file systems to log may have n-to-1 relationship; */ - bdev =blkdev_get_by_dev (sbi->logdev,BLK_OPEN_READ |BLK_OPEN_WRITE , - log,NULL ); -if (IS_ERR (bdev)) { - rc =PTR_ERR (bdev); + bdev_handle =blkdev_get_handle_by_dev (sbi->logdev, +BLK_OPEN_READ |BLK_OPEN_WRITE , log,NULL ); +if (IS_ERR (bdev_handle)) { + rc =PTR_ERR (bdev_handle); goto free; } - log->bdev = bdev; + log->bdev_handle = bdev_handle;uuid_copy (&log->uuid, &sbi->loguuid);/* @@ -1141,7 +1141,7 @@ int lmLogOpen(struct super_block *sb)lbmLogShutdown (log); close:/* close external log device */ -blkdev_put (bdev, log); +blkdev_handle_put (bdev_handle); free:/* free log descriptor */ mutex_unlock (&jfs_log_mutex);@@ -1162,7 +1162,7 @@ static int open_inline_log(struct super_block *sb)init_waitqueue_head (&log->syncwait);set_bit (log_INLINELOG, &log->flag); - log->bdev = sb->s_bdev; + log->bdev_handle = sb->s_bdev_handle; log->base =addressPXD (&JFS_SBI (sb)->logpxd); log->size =lengthPXD (&JFS_SBI (sb)->logpxd) >> (L2LOGPSIZE - sb->s_blocksize_bits);@@ -1436,7 +1436,7 @@ int lmLogClose(struct super_block *sb) {struct jfs_sb_info *sbi =JFS_SBI (sb);struct jfs_log *log = sbi->log; -struct block_device *bdev; +struct bdev_handle *bdev_handle;int rc =0 ;jfs_info ("lmLogClose: log:0x%p" , log);@@ -1482,10 +1482,10 @@ int lmLogClose(struct super_block *sb)* external log as separate logical volume */ list_del (&log->journal_list); - bdev = log->bdev; + bdev_handle = log->bdev_handle; rc =lmLogShutdown (log); -blkdev_put (bdev, log); +blkdev_handle_put (bdev_handle);kfree (log);@@ -1972,7 +1972,7 @@ static int lbmRead(struct jfs_log * log, int pn, struct lbuf ** bpp) bp->l_flag |= lbmREAD; - bio =bio_alloc (log->bdev,1 ,REQ_OP_READ ,GFP_NOFS ); + bio =bio_alloc (log->bdev_handle->bdev,1 ,REQ_OP_READ ,GFP_NOFS ); bio->bi_iter.bi_sector = bp->l_blkno << (log->l2bsize -9 );__bio_add_page (bio, bp->l_page,LOGPSIZE , bp->l_offset);BUG_ON (bio->bi_iter.bi_size !=LOGPSIZE );@@ -2113,7 +2113,8 @@ static void lbmStartIO(struct lbuf * bp)jfs_info ("lbmStartIO" ); - bio =bio_alloc (log->bdev,1 ,REQ_OP_WRITE |REQ_SYNC ,GFP_NOFS ); + bio =bio_alloc (log->bdev_handle->bdev,1 ,REQ_OP_WRITE |REQ_SYNC , +GFP_NOFS ); bio->bi_iter.bi_sector = bp->l_blkno << (log->l2bsize -9 );__bio_add_page (bio, bp->l_page,LOGPSIZE , bp->l_offset);BUG_ON (bio->bi_iter.bi_size !=LOGPSIZE );fs/jfs/jfs_logmgr.h +1
-1@@ -356,7 +356,7 @@ struct jfs_log {* before writing syncpt. */ struct list_head journal_list;/* Global list */ -struct block_device *bdev;/* 4: log lv pointer */ +struct bdev_handle *bdev_handle;/* 4: log lv pointer */ int serial;/* 4: log mount serial number */ s64 base;/* @8: log extent address (inline log ) */ fs/jfs/jfs_mount.c +2
-1@@ -430,7 +430,8 @@ int updateSuper(struct super_block *sb, uint state)if (state ==FM_MOUNT ) {/* record log's dev_t and mount serial number */ - j_sb->s_logdev =cpu_to_le32 (new_encode_dev (sbi->log->bdev->bd_dev)); + j_sb->s_logdev =cpu_to_le32 ( +new_encode_dev (sbi->log->bdev_handle->bdev->bd_dev)); j_sb->s_logserial =cpu_to_le32 (sbi->log->serial); }else if (state ==FM_CLEAN ) {/*
Jan Kara
reviewerPATCH 26/32 nfs/blocklayout: Convert to use blkdev_get_handle_by_dev/path()
In reply to Jan KaraConvert block device handling to use blkdev_get_handle_by_dev/path() and pass the handle around.
--- fs/nfs/blocklayout/blocklayout.h | 2 +- fs/nfs/blocklayout/dev.c | 76 ++++++++++++++++---------------- 2 files changed, 38 insertions(+), 40 deletions(-)
fs/nfs/blocklayout/blocklayout.h +1 -1
@@ -108,7 +108,7 @@ struct pnfs_block_dev {struct pnfs_block_dev *children;u64 chunk_size; -struct block_device *bdev; +struct bdev_handle *bdev_handle;u64 disk_offset;u64 pr_key;
fs/nfs/blocklayout/dev.c +37 -39
160 lines not on this page · raw message
Signature · 1 line
2.35.3
Jan Kara
reviewerPATCH 27/32 nilfs2: Convert to use blkdev_get_handle_by_path()
In reply to Jan KaraConvert nilfs2 to use blkdev_get_handle_by_path() and initialize the superblock with the handle.
--- fs/nilfs2/super.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
fs/nilfs2/super.c +12 -9
@@ -1283,14 +1283,15 @@ static int nilfs_identify(char *data, struct nilfs_super_data *sd)static int nilfs_set_bdev_super (struct super_block *s,void *data) { - s->s_bdev = data; + s->s_bdev_handle = data; + s->s_bdev = s->s_bdev_handle->bdev; s->s_dev = s->s_bdev->bd_dev;return 0 ; }static int nilfs_test_bdev_super (struct super_block *s,void *data) { -return (void *)s->s_bdev == data; +return s->s_bdev == ((struct bdev_handle *)data)->bdev; } static struct dentry *
@@ -1298,15 +1299,17 @@ nilfs_mount(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) { struct nilfs_super_data sd; +struct bdev_handle *bdev_handle;struct super_block *s;struct dentry *root_dentry;int err, s_new = false; - sd.bdev =blkdev_get_by_path (dev_name,sb_open_mode (flags), fs_type, -NULL ); -if (IS_ERR (sd.bdev)) -return ERR_CAST (sd.bdev); + bdev_handle =blkdev_get_handle_by_path (dev_name,sb_open_mode (flags), + fs_type,NULL ); +if (IS_ERR (bdev_handle)) +return ERR_CAST (bdev_handle); + sd.bdev = bdev_handle->bdev; sd.cno =0 ; sd.flags = flags;if (nilfs_identify ((char *)data, &sd)) {
@@ -1326,7 +1329,7 @@ nilfs_mount(struct file_system_type *fs_type, int flags, goto failed; } s =sget (fs_type, nilfs_test_bdev_super, nilfs_set_bdev_super, flags, - sd.bdev); + bdev_handle);mutex_unlock (&sd.bdev->bd_fsfreeze_mutex);if (IS_ERR (s)) { err =PTR_ERR (s);
@@ -1374,7 +1377,7 @@ nilfs_mount(struct file_system_type *fs_type, int flags, }if (!s_new) -blkdev_put (sd.bdev, fs_type); +blkdev_handle_put (bdev_handle);return root_dentry;
@@ -1383,7 +1386,7 @@ nilfs_mount(struct file_system_type *fs_type, int flags, failed:if (!s_new) -blkdev_put (sd.bdev, fs_type); +blkdev_handle_put (bdev_handle);return ERR_PTR (err); }
Signature · 1 line
2.35.3
Re: [PATCH 27/32] nilfs2: Convert to use blkdev_get_handle_by_path()
Quoted 9 lines · On Tue, Jul 4, 2023 at 9:24 PM Jan Kara wrote:
Convert nilfs2 to use
blkdev_get_handle_by_path()and initialize the superblock with the handle.Signed-off-by Jan Kara <[email protected]>--- fs/nilfs2/super.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
You may revise this patch to reflect comments on the patch 1/32, but the changes here look fine, and I have no objection to rewriting to use bdev_handle.
Thanks,
Ryusuke Konishi
Quoted 75 lines
fs/nilfs2/super.c +12
-10@@ -1283,14 +1283,15 @@ static int nilfs_identify(char *data, struct nilfs_super_data *sd)static int nilfs_set_bdev_super (struct super_block *s,void *data) { - s->s_bdev = data; + s->s_bdev_handle = data; + s->s_bdev = s->s_bdev_handle->bdev; s->s_dev = s->s_bdev->bd_dev;return 0 ; }static int nilfs_test_bdev_super (struct super_block *s,void *data) { -return (void *)s->s_bdev == data; +return s->s_bdev == ((struct bdev_handle *)data)->bdev; } static struct dentry *@@ -1298,15 +1299,17 @@ nilfs_mount(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) { struct nilfs_super_data sd; +struct bdev_handle *bdev_handle;struct super_block *s;struct dentry *root_dentry;int err, s_new = false; - sd.bdev =blkdev_get_by_path (dev_name,sb_open_mode (flags), fs_type, -NULL ); -if (IS_ERR (sd.bdev)) -return ERR_CAST (sd.bdev); + bdev_handle =blkdev_get_handle_by_path (dev_name,sb_open_mode (flags), + fs_type,NULL ); +if (IS_ERR (bdev_handle)) +return ERR_CAST (bdev_handle); + sd.bdev = bdev_handle->bdev; sd.cno =0 ; sd.flags = flags;if (nilfs_identify ((char *)data, &sd)) {@@ -1326,7 +1329,7 @@ nilfs_mount(struct file_system_type *fs_type, int flags, goto failed; } s =sget (fs_type, nilfs_test_bdev_super, nilfs_set_bdev_super, flags, - sd.bdev); + bdev_handle);mutex_unlock (&sd.bdev->bd_fsfreeze_mutex);if (IS_ERR (s)) { err =PTR_ERR (s);@@ -1374,7 +1377,7 @@ nilfs_mount(struct file_system_type *fs_type, int flags, }if (!s_new) -blkdev_put (sd.bdev, fs_type); +blkdev_handle_put (bdev_handle);return root_dentry;@@ -1383,7 +1386,7 @@ nilfs_mount(struct file_system_type *fs_type, int flags, failed:if (!s_new) -blkdev_put (sd.bdev, fs_type); +blkdev_handle_put (bdev_handle);return ERR_PTR (err); } --2.35.3
Jan Kara
reviewerPATCH 28/32 ocfs2: Convert to use blkdev_get_handle_by_dev()
In reply to Jan KaraConvert ocfs2 heartbeat code to use blkdev_get_handle_by_dev() and pass the handle around.
--- fs/ocfs2/cluster/heartbeat.c | 82 ++++++++++++++++++++---------------- 1 file changed, 46 insertions(+), 36 deletions(-)
fs/ocfs2/cluster/heartbeat.c +46 -36
@@ -213,7 +213,7 @@ struct o2hb_region {unsigned int hr_num_pages;struct page **hr_slot_data; -struct block_device *hr_bdev; +struct bdev_handle *hr_bdev_handle;struct o2hb_disk_slot *hr_slots;/* live node map of this region */
@@ -261,6 +261,11 @@ struct o2hb_region {int hr_last_hb_status; }; +static inline struct block_device *reg_bdev (struct o2hb_region *reg) +{ +return reg->hr_bdev_handle ? reg->hr_bdev_handle->bdev :NULL ; +} +struct o2hb_bio_wait_ctxt {atomic_t wc_num_reqs;struct completion wc_io_complete;
@@ -286,7 +291,7 @@ static void o2hb_write_timeout(struct work_struct *work) hr_write_timeout_work.work);mlog (ML_ERROR ,"Heartbeat write timeout to device %pg after %u " -"milliseconds\n" , reg->hr_bdev, +"milliseconds\n" ,reg_bdev (reg),jiffies_to_msecs (jiffies - reg->hr_last_timeout_start));if (o2hb_global_heartbeat_active ()) {
@@ -383,7 +388,7 @@ static void o2hb_nego_timeout(struct work_struct *work)if (!test_bit (master_node, reg->hr_nego_node_bitmap)) {printk (KERN_NOTICE "o2hb: node %d hb write hung for %ds on region %s (%pg).\n" ,o2nm_this_node (),O2HB_NEGO_TIMEOUT_MS /1000 , -config_item_name (®->hr_item), reg->hr_bdev); +config_item_name (®->hr_item),reg_bdev (reg));set_bit (master_node, reg->hr_nego_node_bitmap); } if (!bitmap_equal(reg->hr_nego_node_bitmap, live_node_bitmap,
@@ -398,7 +403,8 @@ static void o2hb_nego_timeout(struct work_struct *work) }printk (KERN_NOTICE "o2hb: all nodes hb write hung, maybe region %s (%pg) is down.\n" , -config_item_name (®->hr_item), reg->hr_bdev); +config_item_name (®->hr_item), +reg_bdev (reg));/* approve negotiate timeout request. */ o2hb_arm_timeout (reg);
@@ -419,7 +425,7 @@ static void o2hb_nego_timeout(struct work_struct *work)/* negotiate timeout with master node. */ printk (KERN_NOTICE "o2hb: node %d hb write hung for %ds on region %s (%pg), negotiate timeout with node %d.\n" ,o2nm_this_node (),O2HB_NEGO_TIMEOUT_MS /1000 ,config_item_name (®->hr_item), - reg->hr_bdev, master_node); +reg_bdev (reg), master_node); ret =o2hb_send_nego_msg (reg->hr_key,O2HB_NEGO_TIMEOUT_MSG , master_node);if (ret)
@@ -436,7 +442,8 @@ static int o2hb_nego_timeout_handler(struct o2net_msg *msg, u32 len, void *data, nego_msg = (struct o2hb_nego_msg *)msg->buf;printk (KERN_NOTICE "o2hb: receive negotiate timeout message from node %d on region %s (%pg).\n" , - nego_msg->node_num,config_item_name (®->hr_item), reg->hr_bdev); + nego_msg->node_num,config_item_name (®->hr_item), +reg_bdev (reg));if (nego_msg->node_num <O2NM_MAX_NODES )set_bit (nego_msg->node_num, reg->hr_nego_node_bitmap);else
@@ -451,7 +458,7 @@ static int o2hb_nego_approve_handler(struct o2net_msg *msg, u32 len, void *data,struct o2hb_region *reg = data;printk (KERN_NOTICE "o2hb: negotiate timeout approved by master node on region %s (%pg).\n" , -config_item_name (®->hr_item), reg->hr_bdev); +config_item_name (®->hr_item),reg_bdev (reg));o2hb_arm_timeout (reg);return 0 ; }
@@ -515,7 +522,7 @@ static struct bio *o2hb_setup_one_bio(struct o2hb_region *reg,* GFP_KERNEL that the local node can get fenced. It would be * nicest if we could pre-allocate these bios and avoid this * all together. */ - bio =bio_alloc (reg->hr_bdev,16 , opf,GFP_ATOMIC ); + bio =bio_alloc (reg_bdev (reg),16 , opf,GFP_ATOMIC );if (!bio) {mlog (ML_ERROR ,"Could not alloc slots BIO!\n" ); bio =ERR_PTR (-ENOMEM );
@@ -687,7 +694,7 @@ static int o2hb_check_own_slot(struct o2hb_region *reg) errstr =ERRSTR3 ; mlog(ML_ERROR, "%s (%pg): expected(%u:0x%llx, 0x%llx), " - "ondisk(%u:0x%llx, 0x%llx)\n", errstr, reg->hr_bdev, + "ondisk(%u:0x%llx, 0x%llx)\n", errstr, reg_bdev(reg), slot->ds_node_num, (unsigned long long)slot->ds_last_generation, (unsigned long long)slot->ds_last_time, hb_block->hb_node, (unsigned long long)le64_to_cpu(hb_block->hb_generation),
@@ -861,7 +868,7 @@ static void o2hb_set_quorum_device(struct o2hb_region *reg) goto unlock;printk (KERN_NOTICE "o2hb: Region %s (%pg) is now a quorum device\n" , -config_item_name (®->hr_item), reg->hr_bdev); +config_item_name (®->hr_item),reg_bdev (reg));set_bit (reg->hr_region_num, o2hb_quorum_region_bitmap);
@@ -920,7 +927,7 @@ static int o2hb_check_slot(struct o2hb_region *reg,* consider it a transient miss but don't populate any * other values as they may be junk. */ mlog (ML_ERROR ,"Node %d has written a bad crc to %pg\n" , - slot->ds_node_num, reg->hr_bdev); + slot->ds_node_num,reg_bdev (reg));o2hb_dump_slot (hb_block); slot->ds_equal_samples++;
@@ -1003,8 +1010,8 @@ static int o2hb_check_slot(struct o2hb_region *reg,"of %u ms, but our count is %u ms.\n" "Please double check your configuration values " "for 'O2CB_HEARTBEAT_THRESHOLD'\n" , - slot->ds_node_num, reg->hr_bdev, slot_dead_ms, - dead_ms); + slot->ds_node_num,reg_bdev (reg), + slot_dead_ms, dead_ms); } goto out; }
@@ -1143,7 +1150,7 @@ static int o2hb_do_disk_heartbeat(struct o2hb_region *reg)* can't be sure that the new block ever made it to * disk */ mlog (ML_ERROR ,"Write error %d on device \"%pg\"\n" , - write_wc.wc_error, reg->hr_bdev); + write_wc.wc_error,reg_bdev (reg)); ret = write_wc.wc_error; goto bail; }
@@ -1169,7 +1176,7 @@ static int o2hb_do_disk_heartbeat(struct o2hb_region *reg)printk (KERN_NOTICE "o2hb: Unable to stabilize " "heartbeat on region %s (%pg)\n" ,config_item_name (®->hr_item), - reg->hr_bdev); +reg_bdev (reg));atomic_set (®->hr_steady_iterations,0 ); reg->hr_aborted_start =1 ;wake_up (&o2hb_steady_queue);
@@ -1489,7 +1496,7 @@ static void o2hb_region_release(struct config_item *item)struct page *page;struct o2hb_region *reg =to_o2hb_region (item); -mlog (ML_HEARTBEAT ,"hb region release (%pg)\n" , reg->hr_bdev); +mlog (ML_HEARTBEAT ,"hb region release (%pg)\n" ,reg_bdev (reg));kfree (reg->hr_tmp_block);
@@ -1502,8 +1509,8 @@ static void o2hb_region_release(struct config_item *item)kfree (reg->hr_slot_data); } -if (reg->hr_bdev) -blkdev_put (reg->hr_bdev,NULL ); +if (reg->hr_bdev_handle) +blkdev_handle_put (reg->hr_bdev_handle);kfree (reg->hr_slots);
@@ -1562,7 +1569,7 @@ static ssize_t o2hb_region_block_bytes_store(struct config_item *item,unsigned long block_bytes;unsigned int block_bits; -if (reg->hr_bdev) +if (reg->hr_bdev_handle)return -EINVAL ; status = o2hb_read_block_input(reg, page, &block_bytes,
@@ -1591,7 +1598,7 @@ static ssize_t o2hb_region_start_block_store(struct config_item *item,char *p = (char *)page;ssize_t ret; -if (reg->hr_bdev) +if (reg->hr_bdev_handle)return -EINVAL ; ret =kstrtoull (p,0 , &tmp);
@@ -1616,7 +1623,7 @@ static ssize_t o2hb_region_blocks_store(struct config_item *item,unsigned long tmp;char *p = (char *)page; -if (reg->hr_bdev) +if (reg->hr_bdev_handle)return -EINVAL ; tmp =simple_strtoul (p, &p,0 );
@@ -1635,8 +1642,8 @@ static ssize_t o2hb_region_dev_show(struct config_item *item, char *page) {unsigned int ret =0 ; -if (to_o2hb_region (item)->hr_bdev) - ret =sprintf (page,"%pg\n" ,to_o2hb_region (item)->hr_bdev); +if (to_o2hb_region (item)->hr_bdev_handle) + ret =sprintf (page,"%pg\n" ,reg_bdev (to_o2hb_region (item)));return ret; }
@@ -1745,7 +1752,10 @@ static int o2hb_populate_slot_data(struct o2hb_region *reg)return ret; } -/* this is acting as commit; we set up all of hr_bdev and hr_task or nothing */ +/* +* this is acting as commit; we set up all of hr_bdev_handle and hr_task or +* nothing +*/ static ssize_t o2hb_region_dev_store (struct config_item *item,const char *page,size_t count)
@@ -1759,7 +1769,7 @@ static ssize_t o2hb_region_dev_store(struct config_item *item,ssize_t ret = -EINVAL ;int live_threshold; -if (reg->hr_bdev) +if (reg->hr_bdev_handle) goto out;/* We can't heartbeat without having had our node number
@@ -1785,16 +1795,16 @@ static ssize_t o2hb_region_dev_store(struct config_item *item,if (!S_ISBLK (f.file->f_mapping->host->i_mode)) goto out2; - reg->hr_bdev =blkdev_get_by_dev (f.file->f_mapping->host->i_rdev, -BLK_OPEN_WRITE |BLK_OPEN_READ ,NULL , -NULL ); -if (IS_ERR (reg->hr_bdev)) { - ret =PTR_ERR (reg->hr_bdev); - reg->hr_bdev =NULL ; + reg->hr_bdev_handle =blkdev_get_handle_by_dev ( + f.file->f_mapping->host->i_rdev, +BLK_OPEN_WRITE |BLK_OPEN_READ ,NULL ,NULL ); +if (IS_ERR (reg->hr_bdev_handle)) { + ret =PTR_ERR (reg->hr_bdev_handle); + reg->hr_bdev_handle =NULL ; goto out2; } - sectsize =bdev_logical_block_size (reg->hr_bdev); + sectsize =bdev_logical_block_size (reg_bdev (reg));if (sectsize != reg->hr_block_bytes) { mlog(ML_ERROR, "blocksize %u incorrect for device, expected %d",
@@ -1890,12 +1900,12 @@ static ssize_t o2hb_region_dev_store(struct config_item *item,if (hb_task &&o2hb_global_heartbeat_active ())printk (KERN_NOTICE "o2hb: Heartbeat started on region %s (%pg)\n" , -config_item_name (®->hr_item), reg->hr_bdev); +config_item_name (®->hr_item),reg_bdev (reg)); out3:if (ret <0 ) { -blkdev_put (reg->hr_bdev,NULL ); - reg->hr_bdev =NULL ; +blkdev_handle_put (reg->hr_bdev_handle); + reg->hr_bdev_handle =NULL ; } out2:fdput (f);
@@ -2085,7 +2095,7 @@ static void o2hb_heartbeat_group_drop_item(struct config_group *group,printk (KERN_NOTICE "o2hb: Heartbeat %s on region %s (%pg)\n" , ((atomic_read (®->hr_steady_iterations) ==0 ) ?"stopped" :"start aborted" ),config_item_name (item), - reg->hr_bdev); +reg_bdev (reg)); }/*
Signature · 1 line
2.35.3
Re: [PATCH 28/32] ocfs2: Convert to use blkdev_get_handle_by_dev()
Quoted 6 lines · Jan Kara
Convert ocfs2 heartbeat code to use
blkdev_get_handle_by_dev()and pass the handle around.
Looks good.
Quoted 278 lines
--- fs/ocfs2/cluster/heartbeat.c | 82 ++++++++++++++++++++---------------- 1 file changed, 46 insertions(+), 36 deletions(-)fs/ocfs2/cluster/heartbeat.c +46
-36@@ -213,7 +213,7 @@ struct o2hb_region {unsigned int hr_num_pages;struct page **hr_slot_data; -struct block_device *hr_bdev; +struct bdev_handle *hr_bdev_handle;struct o2hb_disk_slot *hr_slots;/* live node map of this region */ @@ -261,6 +261,11 @@ struct o2hb_region {int hr_last_hb_status; }; +static inline struct block_device *reg_bdev (struct o2hb_region *reg) +{ +return reg->hr_bdev_handle ? reg->hr_bdev_handle->bdev :NULL ; +} +struct o2hb_bio_wait_ctxt {atomic_t wc_num_reqs;struct completion wc_io_complete;@@ -286,7 +291,7 @@ static void o2hb_write_timeout(struct work_struct *work) hr_write_timeout_work.work);mlog (ML_ERROR ,"Heartbeat write timeout to device %pg after %u " -"milliseconds\n" , reg->hr_bdev, +"milliseconds\n" ,reg_bdev (reg),jiffies_to_msecs (jiffies - reg->hr_last_timeout_start));if (o2hb_global_heartbeat_active ()) {@@ -383,7 +388,7 @@ static void o2hb_nego_timeout(struct work_struct *work)if (!test_bit (master_node, reg->hr_nego_node_bitmap)) {printk (KERN_NOTICE "o2hb: node %d hb write hung for %ds on region %s (%pg).\n" ,o2nm_this_node (),O2HB_NEGO_TIMEOUT_MS /1000 , -config_item_name (®->hr_item), reg->hr_bdev); +config_item_name (®->hr_item),reg_bdev (reg));set_bit (master_node, reg->hr_nego_node_bitmap); } if (!bitmap_equal(reg->hr_nego_node_bitmap, live_node_bitmap,@@ -398,7 +403,8 @@ static void o2hb_nego_timeout(struct work_struct *work) }printk (KERN_NOTICE "o2hb: all nodes hb write hung, maybe region %s (%pg) is down.\n" , -config_item_name (®->hr_item), reg->hr_bdev); +config_item_name (®->hr_item), +reg_bdev (reg));/* approve negotiate timeout request. */ o2hb_arm_timeout (reg);@@ -419,7 +425,7 @@ static void o2hb_nego_timeout(struct work_struct *work)/* negotiate timeout with master node. */ printk (KERN_NOTICE "o2hb: node %d hb write hung for %ds on region %s (%pg), negotiate timeout with node %d.\n" ,o2nm_this_node (),O2HB_NEGO_TIMEOUT_MS /1000 ,config_item_name (®->hr_item), - reg->hr_bdev, master_node); +reg_bdev (reg), master_node); ret =o2hb_send_nego_msg (reg->hr_key,O2HB_NEGO_TIMEOUT_MSG , master_node);if (ret)@@ -436,7 +442,8 @@ static int o2hb_nego_timeout_handler(struct o2net_msg *msg, u32 len, void *data, nego_msg = (struct o2hb_nego_msg *)msg->buf;printk (KERN_NOTICE "o2hb: receive negotiate timeout message from node %d on region %s (%pg).\n" , - nego_msg->node_num,config_item_name (®->hr_item), reg->hr_bdev); + nego_msg->node_num,config_item_name (®->hr_item), +reg_bdev (reg));if (nego_msg->node_num <O2NM_MAX_NODES )set_bit (nego_msg->node_num, reg->hr_nego_node_bitmap);else @@ -451,7 +458,7 @@ static int o2hb_nego_approve_handler(struct o2net_msg *msg, u32 len, void *data,struct o2hb_region *reg = data;printk (KERN_NOTICE "o2hb: negotiate timeout approved by master node on region %s (%pg).\n" , -config_item_name (®->hr_item), reg->hr_bdev); +config_item_name (®->hr_item),reg_bdev (reg));o2hb_arm_timeout (reg);return 0 ; }@@ -515,7 +522,7 @@ static struct bio *o2hb_setup_one_bio(struct o2hb_region *reg,* GFP_KERNEL that the local node can get fenced. It would be * nicest if we could pre-allocate these bios and avoid this * all together. */ - bio =bio_alloc (reg->hr_bdev,16 , opf,GFP_ATOMIC ); + bio =bio_alloc (reg_bdev (reg),16 , opf,GFP_ATOMIC );if (!bio) {mlog (ML_ERROR ,"Could not alloc slots BIO!\n" ); bio =ERR_PTR (-ENOMEM );@@ -687,7 +694,7 @@ static int o2hb_check_own_slot(struct o2hb_region *reg) errstr =ERRSTR3 ; mlog(ML_ERROR, "%s (%pg): expected(%u:0x%llx, 0x%llx), " - "ondisk(%u:0x%llx, 0x%llx)\n", errstr, reg->hr_bdev, + "ondisk(%u:0x%llx, 0x%llx)\n", errstr, reg_bdev(reg), slot->ds_node_num, (unsigned long long)slot->ds_last_generation, (unsigned long long)slot->ds_last_time, hb_block->hb_node, (unsigned long long)le64_to_cpu(hb_block->hb_generation),@@ -861,7 +868,7 @@ static void o2hb_set_quorum_device(struct o2hb_region *reg) goto unlock;printk (KERN_NOTICE "o2hb: Region %s (%pg) is now a quorum device\n" , -config_item_name (®->hr_item), reg->hr_bdev); +config_item_name (®->hr_item),reg_bdev (reg));set_bit (reg->hr_region_num, o2hb_quorum_region_bitmap);@@ -920,7 +927,7 @@ static int o2hb_check_slot(struct o2hb_region *reg,* consider it a transient miss but don't populate any * other values as they may be junk. */ mlog (ML_ERROR ,"Node %d has written a bad crc to %pg\n" , - slot->ds_node_num, reg->hr_bdev); + slot->ds_node_num,reg_bdev (reg));o2hb_dump_slot (hb_block); slot->ds_equal_samples++;@@ -1003,8 +1010,8 @@ static int o2hb_check_slot(struct o2hb_region *reg,"of %u ms, but our count is %u ms.\n" "Please double check your configuration values " "for 'O2CB_HEARTBEAT_THRESHOLD'\n" , - slot->ds_node_num, reg->hr_bdev, slot_dead_ms, - dead_ms); + slot->ds_node_num,reg_bdev (reg), + slot_dead_ms, dead_ms); } goto out; }@@ -1143,7 +1150,7 @@ static int o2hb_do_disk_heartbeat(struct o2hb_region *reg)* can't be sure that the new block ever made it to * disk */ mlog (ML_ERROR ,"Write error %d on device \"%pg\"\n" , - write_wc.wc_error, reg->hr_bdev); + write_wc.wc_error,reg_bdev (reg)); ret = write_wc.wc_error; goto bail; }@@ -1169,7 +1176,7 @@ static int o2hb_do_disk_heartbeat(struct o2hb_region *reg)printk (KERN_NOTICE "o2hb: Unable to stabilize " "heartbeat on region %s (%pg)\n" ,config_item_name (®->hr_item), - reg->hr_bdev); +reg_bdev (reg));atomic_set (®->hr_steady_iterations,0 ); reg->hr_aborted_start =1 ;wake_up (&o2hb_steady_queue);@@ -1489,7 +1496,7 @@ static void o2hb_region_release(struct config_item *item)struct page *page;struct o2hb_region *reg =to_o2hb_region (item); -mlog (ML_HEARTBEAT ,"hb region release (%pg)\n" , reg->hr_bdev); +mlog (ML_HEARTBEAT ,"hb region release (%pg)\n" ,reg_bdev (reg));kfree (reg->hr_tmp_block);@@ -1502,8 +1509,8 @@ static void o2hb_region_release(struct config_item *item)kfree (reg->hr_slot_data); } -if (reg->hr_bdev) -blkdev_put (reg->hr_bdev,NULL ); +if (reg->hr_bdev_handle) +blkdev_handle_put (reg->hr_bdev_handle);kfree (reg->hr_slots);@@ -1562,7 +1569,7 @@ static ssize_t o2hb_region_block_bytes_store(struct config_item *item,unsigned long block_bytes;unsigned int block_bits; -if (reg->hr_bdev) +if (reg->hr_bdev_handle)return -EINVAL ; status = o2hb_read_block_input(reg, page, &block_bytes,@@ -1591,7 +1598,7 @@ static ssize_t o2hb_region_start_block_store(struct config_item *item,char *p = (char *)page;ssize_t ret; -if (reg->hr_bdev) +if (reg->hr_bdev_handle)return -EINVAL ; ret =kstrtoull (p,0 , &tmp);@@ -1616,7 +1623,7 @@ static ssize_t o2hb_region_blocks_store(struct config_item *item,unsigned long tmp;char *p = (char *)page; -if (reg->hr_bdev) +if (reg->hr_bdev_handle)return -EINVAL ; tmp =simple_strtoul (p, &p,0 );@@ -1635,8 +1642,8 @@ static ssize_t o2hb_region_dev_show(struct config_item *item, char *page) {unsigned int ret =0 ; -if (to_o2hb_region (item)->hr_bdev) - ret =sprintf (page,"%pg\n" ,to_o2hb_region (item)->hr_bdev); +if (to_o2hb_region (item)->hr_bdev_handle) + ret =sprintf (page,"%pg\n" ,reg_bdev (to_o2hb_region (item)));return ret; }@@ -1745,7 +1752,10 @@ static int o2hb_populate_slot_data(struct o2hb_region *reg)return ret; } -/* this is acting as commit; we set up all of hr_bdev and hr_task or nothing */ +/* +* this is acting as commit; we set up all of hr_bdev_handle and hr_task or +* nothing +*/ static ssize_t o2hb_region_dev_store (struct config_item *item,const char *page,size_t count)@@ -1759,7 +1769,7 @@ static ssize_t o2hb_region_dev_store(struct config_item *item,ssize_t ret = -EINVAL ;int live_threshold; -if (reg->hr_bdev) +if (reg->hr_bdev_handle) goto out;/* We can't heartbeat without having had our node number @@ -1785,16 +1795,16 @@ static ssize_t o2hb_region_dev_store(struct config_item *item,if (!S_ISBLK (f.file->f_mapping->host->i_mode)) goto out2; - reg->hr_bdev =blkdev_get_by_dev (f.file->f_mapping->host->i_rdev, -BLK_OPEN_WRITE |BLK_OPEN_READ ,NULL , -NULL ); -if (IS_ERR (reg->hr_bdev)) { - ret =PTR_ERR (reg->hr_bdev); - reg->hr_bdev =NULL ; + reg->hr_bdev_handle =blkdev_get_handle_by_dev ( + f.file->f_mapping->host->i_rdev, +BLK_OPEN_WRITE |BLK_OPEN_READ ,NULL ,NULL ); +if (IS_ERR (reg->hr_bdev_handle)) { + ret =PTR_ERR (reg->hr_bdev_handle); + reg->hr_bdev_handle =NULL ; goto out2; } - sectsize =bdev_logical_block_size (reg->hr_bdev); + sectsize =bdev_logical_block_size (reg_bdev (reg));if (sectsize != reg->hr_block_bytes) { mlog(ML_ERROR, "blocksize %u incorrect for device, expected %d",@@ -1890,12 +1900,12 @@ static ssize_t o2hb_region_dev_store(struct config_item *item,if (hb_task &&o2hb_global_heartbeat_active ())printk (KERN_NOTICE "o2hb: Heartbeat started on region %s (%pg)\n" , -config_item_name (®->hr_item), reg->hr_bdev); +config_item_name (®->hr_item),reg_bdev (reg)); out3:if (ret <0 ) { -blkdev_put (reg->hr_bdev,NULL ); - reg->hr_bdev =NULL ; +blkdev_handle_put (reg->hr_bdev_handle); + reg->hr_bdev_handle =NULL ; } out2:fdput (f);@@ -2085,7 +2095,7 @@ static void o2hb_heartbeat_group_drop_item(struct config_group *group,printk (KERN_NOTICE "o2hb: Heartbeat %s on region %s (%pg)\n" , ((atomic_read (®->hr_steady_iterations) ==0 ) ?"stopped" :"start aborted" ),config_item_name (item), - reg->hr_bdev); +reg_bdev (reg)); }/*
Jan Kara
reviewerPATCH 29/32 reiserfs: Convert to blkdev_get_handle_by_dev/path()
In reply to Jan KaraConvert reiserfs to use blkdev_get_handle_by_dev/path() and pass the handle around.
--- fs/reiserfs/journal.c | 56 +++++++++++++++++++----------------------- fs/reiserfs/procfs.c | 2 +- fs/reiserfs/reiserfs.h | 11 ++++++--- 3 files changed, 33 insertions(+), 36 deletions(-)
fs/reiserfs/journal.c +25 -31
@@ -90,8 +90,7 @@ static int flush_commit_list(struct super_block *s,static int can_dirty (struct reiserfs_journal_cnode *cn);static int journal_join (struct reiserfs_transaction_handle *th,struct super_block *sb); -static void release_journal_dev (struct super_block *super, -struct reiserfs_journal *journal); +static void release_journal_dev (struct reiserfs_journal *journal);static void dirty_one_transaction (struct super_block *s,struct reiserfs_journal_list *jl);static void flush_async_commits (struct work_struct *work);
@@ -1893,7 +1892,7 @@ static void free_journal_ram(struct super_block *sb)* j_header_bh is on the journal dev, make sure * not to release the journal dev until we brelse j_header_bh */ -release_journal_dev (sb, journal); +release_journal_dev (journal);vfree (journal); }
@@ -2385,7 +2384,7 @@ static int journal_read(struct super_block *sb) cur_dblock =SB_ONDISK_JOURNAL_1st_BLOCK (sb);reiserfs_info (sb,"checking transaction log (%pg)\n" , - journal->j_dev_bd); + journal->j_bdev_handle->bdev); start =ktime_get_seconds ();/*
@@ -2446,7 +2445,7 @@ static int journal_read(struct super_block *sb)* device and journal device to be the same */ d_bh = -reiserfs_breada (journal->j_dev_bd, cur_dblock, +reiserfs_breada (journal->j_bdev_handle->bdev, cur_dblock, sb->s_blocksize,SB_ONDISK_JOURNAL_1st_BLOCK (sb) +SB_ONDISK_JOURNAL_SIZE (sb));
@@ -2585,17 +2584,11 @@ static void journal_list_init(struct super_block *sb)SB_JOURNAL (sb)->j_current_jl =alloc_journal_list (sb); } -static void release_journal_dev (struct super_block *super, -struct reiserfs_journal *journal) +static void release_journal_dev (struct reiserfs_journal *journal) { -if (journal->j_dev_bd !=NULL ) { -void *holder =NULL ; - -if (journal->j_dev_bd->bd_dev != super->s_dev) - holder = journal; - -blkdev_put (journal->j_dev_bd, holder); - journal->j_dev_bd =NULL ; +if (journal->j_bdev_handle) { +blkdev_handle_put (journal->j_bdev_handle); + journal->j_bdev_handle =NULL ; } }
@@ -2610,7 +2603,7 @@ static int journal_init_dev(struct super_block *super, result =0 ; - journal->j_dev_bd =NULL ; + journal->j_bdev_handle =NULL ; jdev =SB_ONDISK_JOURNAL_DEVICE (super) ?new_decode_dev (SB_ONDISK_JOURNAL_DEVICE (super)) : super->s_dev;
@@ -2621,36 +2614,37 @@ static int journal_init_dev(struct super_block *super,if ((!jdev_name || !jdev_name[0 ])) {if (jdev == super->s_dev) holder =NULL ; - journal->j_dev_bd =blkdev_get_by_dev (jdev, blkdev_mode, holder, -NULL ); -if (IS_ERR (journal->j_dev_bd)) { - result =PTR_ERR (journal->j_dev_bd); - journal->j_dev_bd =NULL ; + journal->j_bdev_handle =blkdev_get_handle_by_dev (jdev, + blkdev_mode, holder,NULL ); +if (IS_ERR (journal->j_bdev_handle)) { + result =PTR_ERR (journal->j_bdev_handle); + journal->j_bdev_handle =NULL ;reiserfs_warning (super,"sh-458" ,"cannot init journal device unknown-block(%u,%u): %i" ,MAJOR (jdev),MINOR (jdev), result);return result; }else if (jdev != super->s_dev) -set_blocksize (journal->j_dev_bd, super->s_blocksize); +set_blocksize (journal->j_bdev_handle->bdev, + super->s_blocksize);return 0 ; } - journal->j_dev_bd =blkdev_get_by_path (jdev_name, blkdev_mode, holder, -NULL ); -if (IS_ERR (journal->j_dev_bd)) { - result =PTR_ERR (journal->j_dev_bd); - journal->j_dev_bd =NULL ; + journal->j_bdev_handle =blkdev_get_handle_by_path (jdev_name, + blkdev_mode, holder,NULL ); +if (IS_ERR (journal->j_bdev_handle)) { + result =PTR_ERR (journal->j_bdev_handle); + journal->j_bdev_handle =NULL ;reiserfs_warning (super,"sh-457" ,"journal_init_dev: Cannot open '%s': %i" , jdev_name, result);return result; } -set_blocksize (journal->j_dev_bd, super->s_blocksize); +set_blocksize (journal->j_bdev_handle->bdev, super->s_blocksize);reiserfs_info (super,"journal_init_dev: journal device: %pg\n" , - journal->j_dev_bd); + journal->j_bdev_handle->bdev);return 0 ; }
@@ -2808,7 +2802,7 @@ int journal_init(struct super_block *sb, const char *j_dev_name,"journal header magic %x (device %pg) does " "not match to magic found in super block %x" , jh->jh_journal.jp_journal_magic, - journal->j_dev_bd, + journal->j_bdev_handle->bdev, sb_jp_journal_magic(rs));brelse (bhjh); goto free_and_return;
@@ -2832,7 +2826,7 @@ int journal_init(struct super_block *sb, const char *j_dev_name, reiserfs_info(sb, "journal params: device %pg, size %u, " "journal first block %u, max trans len %u, max batch %u, " "max commit age %u, max trans age %u\n", - journal->j_dev_bd, + journal->j_bdev_handle->bdev, SB_ONDISK_JOURNAL_SIZE(sb), SB_ONDISK_JOURNAL_1st_BLOCK(sb), journal->j_trans_max,
fs/reiserfs/procfs.c +1 -1
@@ -354,7 +354,7 @@ static int show_journal(struct seq_file *m, void *unused)"prepare: \t%12lu\n" "prepare_retry: \t%12lu\n" ,DJP (jp_journal_1st_block), -SB_JOURNAL (sb)->j_dev_bd, +SB_JOURNAL (sb)->j_bdev_handle->bdev,DJP (jp_journal_dev),DJP (jp_journal_size), DJP(jp_journal_trans_max),
fs/reiserfs/reiserfs.h +7 -4
@@ -299,7 +299,7 @@ struct reiserfs_journal {/* oldest journal block. start here for traverse */ struct reiserfs_journal_cnode *j_first; -struct block_device *j_dev_bd; +struct bdev_handle *j_bdev_handle;/* first block on s_dev of reserved area journal */ int j_1st_reserved_block;
@@ -2809,9 +2809,12 @@ struct reiserfs_journal_header {#define journal_hash (t,sb,block) ((t)[_jhashfn((sb),(block)) & JBH_HASH_MASK])/* We need these to make journal.c code more readable */ -#define journal_find_get_block (s, block) __find_get_block(SB_JOURNAL(s)->j_dev_bd, block, s->s_blocksize) -#define journal_getblk (s, block) __getblk(SB_JOURNAL(s)->j_dev_bd, block, s->s_blocksize) -#define journal_bread (s, block) __bread(SB_JOURNAL(s)->j_dev_bd, block, s->s_blocksize) +#define journal_find_get_block (s, block) __find_get_block(\ + SB_JOURNAL(s)->j_bdev_handle->bdev, block, s->s_blocksize) +#define journal_getblk (s, block) __getblk(SB_JOURNAL(s)->j_bdev_handle->bdev,\ + block, s->s_blocksize) +#define journal_bread (s, block) __bread(SB_JOURNAL(s)->j_bdev_handle->bdev,\ + block, s->s_blocksize)enum reiserfs_bh_state_bits { BH_JDirty = BH_PrivateStart,/* buffer is in current transaction */
Signature · 1 line
2.35.3
Jan Kara
reviewerPATCH 30/32 xfs: Convert to blkdev_get_handle_by_path()
In reply to Jan KaraConvert xfs to use blkdev_get_handle_by_path() and pass the handle around.
--- fs/xfs/xfs_buf.c | 11 +++++----- fs/xfs/xfs_buf.h | 3 ++- fs/xfs/xfs_super.c | 52 ++++++++++++++++++++++++---------------------- 3 files changed, 35 insertions(+), 31 deletions(-)
fs/xfs/xfs_buf.c +6 -5
@@ -1989,7 +1989,7 @@ xfs_setsize_buftarg_early(struct xfs_buftarg *xfs_alloc_buftarg (struct xfs_mount *mp, -struct block_device *bdev) +struct bdev_handle *bdev_handle) {xfs_buftarg_t *btp;const struct dax_holder_operations *ops =NULL ;
@@ -2000,9 +2000,10 @@ xfs_alloc_buftarg( btp =kmem_zalloc (sizeof (*btp),KM_NOFS ); btp->bt_mount = mp; - btp->bt_dev = bdev->bd_dev; - btp->bt_bdev = bdev; - btp->bt_daxdev =fs_dax_get_by_bdev (bdev, &btp->bt_dax_part_off, + btp->bt_bdev_handle = bdev_handle; + btp->bt_dev = bdev_handle->bdev->bd_dev; + btp->bt_bdev = bdev_handle->bdev; + btp->bt_daxdev =fs_dax_get_by_bdev (btp->bt_bdev, &btp->bt_dax_part_off, mp, ops);/*
@@ -2012,7 +2013,7 @@ xfs_alloc_buftarg(ratelimit_state_init (&btp->bt_ioerror_rl,30 *HZ ,DEFAULT_RATELIMIT_BURST ); -if (xfs_setsize_buftarg_early (btp, bdev)) +if (xfs_setsize_buftarg_early (btp, btp->bt_bdev)) goto error_free;if (list_lru_init (&btp->bt_lru))
fs/xfs/xfs_buf.h +2 -1
@@ -92,6 +92,7 @@ typedef unsigned int xfs_buf_flags_t;*/ typedef struct xfs_buftarg { dev_t bt_dev; + struct bdev_handle *bt_bdev_handle; struct block_device *bt_bdev; struct dax_device *bt_daxdev; u64 bt_dax_part_off;
@@ -351,7 +352,7 @@ xfs_buf_update_cksum(struct xfs_buf *bp, unsigned long cksum_offset)* Handling of buftargs. */ struct xfs_buftarg *xfs_alloc_buftarg (struct xfs_mount *mp, -struct block_device *bdev); +struct bdev_handle *bdev_handle);extern void xfs_free_buftarg (struct xfs_buftarg *);extern void xfs_buftarg_wait (struct xfs_buftarg *);extern void xfs_buftarg_drain (struct xfs_buftarg *);
fs/xfs/xfs_super.c +27 -25
120 lines not on this page · raw message
Signature · 1 line
2.35.3
Jan Kara
reviewerPATCH 31/32 block: Remove blkdev_get_by_*() functions
In reply to Jan Karablkdev_get_by_*() and blkdev_put() functions are now unused. Remove them.
--- block/bdev.c | 89 ++++++++++++++---------------------------- include/linux/blkdev.h | 5 --- 2 files changed, 29 insertions(+), 65 deletions(-)
block/bdev.c +29 -60
@@ -746,7 +746,7 @@ void blkdev_put_no_open(struct block_device *bdev) }/** -* blkdev_get_by_dev - open a block device by device number +* blkdev_get_handle_by_dev - open a block device by device number * @dev: device number of block device to open * @mode: open mode (BLK_OPEN_*) * @holder: exclusive holder identifier
@@ -758,32 +758,40 @@ void blkdev_put_no_open(struct block_device *bdev)* * Use this interface ONLY if you really do not have anything better - i.e. when * you are behind a truly sucky interface and all you are given is a device -* number. Everything else should use blkdev_get_by_path(). +* number. Everything else should use blkdev_get_handle_by_path(). * * CONTEXT: * Might sleep. * * RETURNS: -* Reference to the block_device on success, ERR_PTR(-errno) on failure. +* Handle with a reference to the block_device on success, ERR_PTR(-errno) on +* failure. */ -struct block_device *blkdev_get_by_dev (dev_t dev,blk_mode_t mode,void *holder, -const struct blk_holder_ops *hops) +struct bdev_handle *blkdev_get_handle_by_dev (dev_t dev,blk_mode_t mode, +void *holder,const struct blk_holder_ops *hops) { -bool unblock_events = true; +struct bdev_handle *handle =kmalloc (sizeof (struct bdev_handle ), +GFP_KERNEL );struct block_device *bdev; +bool unblock_events = true;struct gendisk *disk;int ret; +if (!handle) +return ERR_PTR (-ENOMEM ); + ret =devcgroup_check_permission (DEVCG_DEV_BLOCK ,MAJOR (dev),MINOR (dev), ((mode &BLK_OPEN_READ ) ?DEVCG_ACC_READ :0 ) | ((mode &BLK_OPEN_WRITE ) ?DEVCG_ACC_WRITE :0 ));if (ret) -return ERR_PTR (ret); + goto free_handle; bdev =blkdev_get_no_open (dev); -if (!bdev) -return ERR_PTR (-ENXIO ); +if (!bdev) { + ret = -ENXIO ; + goto free_handle; + } disk = bdev->bd_disk;if (holder) {
@@ -832,7 +840,9 @@ struct block_device *blkdev_get_by_dev(dev_t dev, blk_mode_t mode, void *holder,if (unblock_events)disk_unblock_events (disk); -return bdev; + handle->bdev = bdev; + handle->holder = holder; +return handle; put_module:module_put (disk->fops->owner); abort_claiming:
@@ -842,30 +852,14 @@ struct block_device *blkdev_get_by_dev(dev_t dev, blk_mode_t mode, void *holder,disk_unblock_events (disk); put_blkdev:blkdev_put_no_open (bdev); +free_handle: +kfree (handle);return ERR_PTR (ret); } -EXPORT_SYMBOL (blkdev_get_by_dev); - -struct bdev_handle *blkdev_get_handle_by_dev (dev_t dev,blk_mode_t mode, -void *holder,const struct blk_holder_ops *hops) -{ -struct bdev_handle *handle =kmalloc (sizeof (struct bdev_handle ), -GFP_KERNEL ); -struct block_device *bdev; - -if (!handle) -return ERR_PTR (-ENOMEM ); - bdev =blkdev_get_by_dev (dev, mode, holder, hops); -if (IS_ERR (bdev)) -return ERR_CAST (bdev); - handle->bdev = bdev; - handle->holder = holder; -return handle; -}EXPORT_SYMBOL (blkdev_get_handle_by_dev);/** -* blkdev_get_by_path - open a block device by name +* blkdev_get_handle_by_path - open a block device by name * @path: path to the block device to open * @mode: open mode (BLK_OPEN_*) * @holder: exclusive holder identifier
@@ -879,29 +873,9 @@ EXPORT_SYMBOL(blkdev_get_handle_by_dev);* Might sleep. * * RETURNS: -* Reference to the block_device on success, ERR_PTR(-errno) on failure. +* Handle with a reference to the block_device on success, ERR_PTR(-errno) on +* failure. */ -struct block_device *blkdev_get_by_path (const char *path,blk_mode_t mode, -void *holder,const struct blk_holder_ops *hops) -{ -struct block_device *bdev; -dev_t dev; -int error; - - error =lookup_bdev (path, &dev); -if (error) -return ERR_PTR (error); - - bdev =blkdev_get_by_dev (dev, mode, holder, hops); -if (!IS_ERR (bdev) && (mode &BLK_OPEN_WRITE ) &&bdev_read_only (bdev)) { -blkdev_put (bdev, holder); -return ERR_PTR (-EACCES ); - } - -return bdev; -} -EXPORT_SYMBOL (blkdev_get_by_path); -struct bdev_handle *blkdev_get_handle_by_path (const char *path,blk_mode_t mode,void *holder,const struct blk_holder_ops *hops) {
@@ -924,8 +898,9 @@ struct bdev_handle *blkdev_get_handle_by_path(const char *path, blk_mode_t mode, }EXPORT_SYMBOL (blkdev_get_handle_by_path); -void blkdev_put (struct block_device *bdev,void *holder) +void blkdev_handle_put (struct bdev_handle *handle) { +struct block_device *bdev = handle->bdev;struct gendisk *disk = bdev->bd_disk;/*
@@ -939,8 +914,8 @@ void blkdev_put(struct block_device *bdev, void *holder)sync_blockdev (bdev);mutex_lock (&disk->open_mutex); -if (holder) -bd_end_claim (bdev, holder); +if (handle->holder) +bd_end_claim (bdev, handle->holder);/* * Trigger event checking and tell drivers to flush MEDIA_CHANGE
@@ -957,12 +932,6 @@ void blkdev_put(struct block_device *bdev, void *holder)module_put (disk->fops->owner);blkdev_put_no_open (bdev); -} -EXPORT_SYMBOL (blkdev_put); - -void blkdev_handle_put (struct bdev_handle *handle) -{ -blkdev_put (handle->bdev, handle->holder);kfree (handle); }EXPORT_SYMBOL (blkdev_handle_put);
include/linux/blkdev.h +0 -5
@@ -1476,10 +1476,6 @@ struct bdev_handle {void *holder; }; -struct block_device *blkdev_get_by_dev (dev_t dev,blk_mode_t mode,void *holder, -const struct blk_holder_ops *hops); -struct block_device *blkdev_get_by_path (const char *path,blk_mode_t mode, -void *holder,const struct blk_holder_ops *hops);struct bdev_handle *blkdev_get_handle_by_dev (dev_t dev,blk_mode_t mode,void *holder,const struct blk_holder_ops *hops); struct bdev_handle *blkdev_get_handle_by_path(const char *path, blk_mode_t mode,
@@ -1487,7 +1483,6 @@ struct bdev_handle *blkdev_get_handle_by_path(const char *path, blk_mode_t mode,int bd_prepare_to_claim (struct block_device *bdev,void *holder,const struct blk_holder_ops *hops);void bd_abort_claiming (struct block_device *bdev,void *holder); -void blkdev_put (struct block_device *bdev,void *holder);void blkdev_handle_put (struct bdev_handle *handle);/* just for blk-cgroup, don't use elsewhere */
Signature · 1 line
2.35.3
Jan Kara
reviewerPATCH 32/32 block: Rename blkdev_get_handle_by_*() and blkdev_handle_put()
In reply to Jan KaraNow that everybody is converted, we can rename blkdev_get_handle_by_*() and blkdev_handle_put() back to their original names. No functional change.
Done by Coccinelle patch:
@@
expression dev, mode, holder, hops;
@@
- blkdev_get_handle_by_dev(dev, mode, holder, hops)
+ blkdev_get_by_dev(dev, mode, holder, hops)
@@
expression path, mode, holder, hops;
@@
- blkdev_get_handle_by_path(path, mode, holder, hops)
+ blkdev_get_by_path(path, mode, holder, hops)
@@
expression handle;
@@
- blkdev_handle_put(handle)
+ blkdev_put(handle)
plus manual updates of comments, strings, and function declarations itself.
--- block/bdev.c | 24 +++++++++--------- block/fops.c | 6 ++--- block/genhd.c | 6 ++--- block/ioctl.c | 4 +-- drivers/block/drbd/drbd_nl.c | 10 ++++---- drivers/block/pktcdvd.c | 18 +++++++------- drivers/block/rnbd/rnbd-srv.c | 7 +++--- drivers/block/xen-blkback/xenbus.c | 7 +++--- drivers/block/zram/zram_drv.c | 9 ++++--- drivers/md/bcache/super.c | 23 ++++++++--------- drivers/md/dm.c | 6 ++--- drivers/md/md.c | 11 +++++---- drivers/mtd/devices/block2mtd.c | 7 +++--- drivers/nvme/target/io-cmd-bdev.c | 7 +++--- drivers/s390/block/dasd_genhd.c | 20 +++++++-------- drivers/target/target_core_iblock.c | 8 +++--- drivers/target/target_core_pscsi.c | 11 +++++---- fs/btrfs/dev-replace.c | 6 ++--- fs/btrfs/ioctl.c | 4 +-- fs/btrfs/volumes.c | 31 ++++++++++++----------- fs/erofs/super.c | 6 ++--- fs/ext4/super.c | 8 +++--- fs/f2fs/super.c | 15 +++++++----- fs/jfs/jfs_logmgr.c | 9 ++++--- fs/nfs/blocklayout/dev.c | 13 +++++----- fs/nilfs2/super.c | 8 +++--- fs/ocfs2/cluster/heartbeat.c | 10 ++++---- fs/reiserfs/journal.c | 10 ++++---- fs/super.c | 38 ++++++++++++++--------------- fs/xfs/xfs_super.c | 6 ++--- include/linux/blkdev.h | 8 +++--- kernel/power/swap.c | 15 ++++++------ mm/swapfile.c | 9 ++++--- 33 files changed, 194 insertions(+), 186 deletions(-)
block/bdev.c +12 -12
@@ -746,7 +746,7 @@ void blkdev_put_no_open(struct block_device *bdev) }/** -* blkdev_get_handle_by_dev - open a block device by device number +* blkdev_get_by_dev - open a block device by device number * @dev: device number of block device to open * @mode: open mode (BLK_OPEN_*) * @holder: exclusive holder identifier
@@ -758,7 +758,7 @@ void blkdev_put_no_open(struct block_device *bdev)* * Use this interface ONLY if you really do not have anything better - i.e. when * you are behind a truly sucky interface and all you are given is a device -* number. Everything else should use blkdev_get_handle_by_path(). +* number. Everything else should use blkdev_get_by_path(). * * CONTEXT: * Might sleep.
@@ -767,8 +767,8 @@ void blkdev_put_no_open(struct block_device *bdev)* Handle with a reference to the block_device on success, ERR_PTR(-errno) on * failure. */ -struct bdev_handle *blkdev_get_handle_by_dev (dev_t dev,blk_mode_t mode, -void *holder,const struct blk_holder_ops *hops) +struct bdev_handle *blkdev_get_by_dev (dev_t dev,blk_mode_t mode,void *holder, +const struct blk_holder_ops *hops) {struct bdev_handle *handle =kmalloc (sizeof (struct bdev_handle ),GFP_KERNEL );
@@ -856,10 +856,10 @@ struct bdev_handle *blkdev_get_handle_by_dev(dev_t dev, blk_mode_t mode,kfree (handle);return ERR_PTR (ret); } -EXPORT_SYMBOL (blkdev_get_handle_by_dev); +EXPORT_SYMBOL (blkdev_get_by_dev);/** -* blkdev_get_handle_by_path - open a block device by name +* blkdev_get_by_path - open a block device by name * @path: path to the block device to open * @mode: open mode (BLK_OPEN_*) * @holder: exclusive holder identifier
@@ -876,7 +876,7 @@ EXPORT_SYMBOL(blkdev_get_handle_by_dev);* Handle with a reference to the block_device on success, ERR_PTR(-errno) on * failure. */ -struct bdev_handle *blkdev_get_handle_by_path (const char *path,blk_mode_t mode, +struct bdev_handle *blkdev_get_by_path (const char *path,blk_mode_t mode,void *holder,const struct blk_holder_ops *hops) {struct bdev_handle *handle;
@@ -887,18 +887,18 @@ struct bdev_handle *blkdev_get_handle_by_path(const char *path, blk_mode_t mode,if (error)return ERR_PTR (error); - handle =blkdev_get_handle_by_dev (dev, mode, holder, hops); + handle =blkdev_get_by_dev (dev, mode, holder, hops);if (!IS_ERR (handle) && (mode &BLK_OPEN_WRITE ) &&bdev_read_only (handle->bdev)) { -blkdev_handle_put (handle); +blkdev_put (handle);return ERR_PTR (-EACCES ); }return handle; } -EXPORT_SYMBOL (blkdev_get_handle_by_path); +EXPORT_SYMBOL (blkdev_get_by_path); -void blkdev_handle_put (struct bdev_handle *handle) +void blkdev_put (struct bdev_handle *handle) {struct block_device *bdev = handle->bdev;struct gendisk *disk = bdev->bd_disk;
@@ -934,7 +934,7 @@ void blkdev_handle_put(struct bdev_handle *handle)blkdev_put_no_open (bdev);kfree (handle); } -EXPORT_SYMBOL (blkdev_handle_put); +EXPORT_SYMBOL (blkdev_put);/** * lookup_bdev() - Look up a struct block_device by name.
block/fops.c +3 -3
@@ -509,8 +509,8 @@ static int blkdev_open(struct inode *inode, struct file *filp) filp->f_mode |=FMODE_BUF_RASYNC ; mode =file_to_blk_mode (filp); - handle =blkdev_get_handle_by_dev (inode->i_rdev, mode, - mode &BLK_OPEN_EXCL ? filp :NULL ,NULL ); + handle =blkdev_get_by_dev (inode->i_rdev, mode, + mode &BLK_OPEN_EXCL ? filp :NULL ,NULL );if (IS_ERR (handle))return PTR_ERR (handle);
@@ -527,7 +527,7 @@ static int blkdev_open(struct inode *inode, struct file *filp)static int blkdev_release (struct inode *inode,struct file *filp) { -blkdev_handle_put (filp->private_data); +blkdev_put (filp->private_data);return 0 ; }
block/genhd.c +3 -3
@@ -366,12 +366,12 @@ int disk_scan_partitions(struct gendisk *disk, blk_mode_t mode) }set_bit (GD_NEED_PART_SCAN , &disk->state); - handle =blkdev_get_handle_by_dev (disk_devt (disk), - mode & ~BLK_OPEN_EXCL ,NULL ,NULL ); + handle =blkdev_get_by_dev (disk_devt (disk), mode & ~BLK_OPEN_EXCL ,NULL , +NULL );if (IS_ERR (handle)) ret =PTR_ERR (handle);else -blkdev_handle_put (handle); +blkdev_put (handle);/* * If blkdev_get_by_dev() failed early, GD_NEED_PART_SCAN is still set,
block/ioctl.c +2 -2
@@ -470,11 +470,11 @@ static int blkdev_bszset(struct block_device *bdev, blk_mode_t mode,if (mode &BLK_OPEN_EXCL )return set_blocksize (bdev, n); - handle =blkdev_get_handle_by_dev (bdev->bd_dev, mode, &bdev,NULL ); + handle =blkdev_get_by_dev (bdev->bd_dev, mode, &bdev,NULL );if (IS_ERR (handle))return -EBUSY ; ret =set_blocksize (bdev, n); -blkdev_handle_put (handle); +blkdev_put (handle);return ret; }
drivers/block/drbd/drbd_nl.c +5 -5
@@ -82,7 +82,7 @@ static atomic_t notify_genl_seq = ATOMIC_INIT(2); /* two. */DEFINE_MUTEX (notification_mutex); -/* used blkdev_get_handle_by_path, to claim our meta data device(s) */ +/* used blkdev_get_by_path, to claim our meta data device(s) */ static char *drbd_m_holder ="Hands off! this is DRBD's meta data device." ;static void drbd_adm_send_reply (struct sk_buff *skb,struct genl_info *info)
@@ -1640,8 +1640,8 @@ static struct bdev_handle *open_backing_dev(struct drbd_device *device,struct bdev_handle *handle;int err =0 ; - handle =blkdev_get_handle_by_path (bdev_path, -BLK_OPEN_READ |BLK_OPEN_WRITE , claim_ptr,NULL ); + handle =blkdev_get_by_path (bdev_path,BLK_OPEN_READ |BLK_OPEN_WRITE , + claim_ptr,NULL );if (IS_ERR (handle)) {drbd_err (device,"open(\"%s\") failed with %ld\n" , bdev_path,PTR_ERR (handle));
@@ -1653,7 +1653,7 @@ static struct bdev_handle *open_backing_dev(struct drbd_device *device, err =bd_link_disk_holder (handle->bdev, device->vdisk);if (err) { -blkdev_handle_put (handle); +blkdev_put (handle);drbd_err (device,"bd_link_disk_holder(\"%s\", ...) failed with %d\n" , bdev_path, err); handle =ERR_PTR (err);
@@ -1704,7 +1704,7 @@ static void close_backing_dev(struct drbd_device *device,return ;if (do_bd_unlink)bd_unlink_disk_holder (handle->bdev, device->vdisk); -blkdev_handle_put (handle); +blkdev_put (handle); }void drbd_backing_dev_free (struct drbd_device *device,struct drbd_backing_dev *ldev)
drivers/block/pktcdvd.c +9 -9
@@ -2169,8 +2169,8 @@ static int pkt_open_dev(struct pktcdvd_device *pd, bool write)* to read/write from/to it. It is already opened in O_NONBLOCK mode * so open should not fail. */ - bdev_handle =blkdev_get_handle_by_dev (pd->bdev_handle->bdev->bd_dev, -BLK_OPEN_READ , pd,NULL ); + bdev_handle =blkdev_get_by_dev (pd->bdev_handle->bdev->bd_dev, +BLK_OPEN_READ , pd,NULL );if (IS_ERR (bdev_handle)) { ret =PTR_ERR (bdev_handle); goto out;
@@ -2218,7 +2218,7 @@ static int pkt_open_dev(struct pktcdvd_device *pd, bool write)return 0 ; out_putdev: -blkdev_handle_put (bdev_handle); +blkdev_put (bdev_handle); out:return ret; }
@@ -2237,7 +2237,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 ); -blkdev_handle_put (pd->open_bdev_handle); +blkdev_put (pd->open_bdev_handle); pd->open_bdev_handle =NULL ;pkt_shrink_pktlist (pd);
@@ -2519,13 +2519,13 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev) } } - bdev_handle =blkdev_get_handle_by_dev (dev, -BLK_OPEN_READ |BLK_OPEN_NDELAY ,NULL ,NULL ); + bdev_handle =blkdev_get_by_dev (dev,BLK_OPEN_READ |BLK_OPEN_NDELAY , +NULL ,NULL );if (IS_ERR (bdev_handle))return PTR_ERR (bdev_handle); sdev =scsi_device_from_queue (bdev_handle->bdev->bd_disk->queue);if (!sdev) { -blkdev_handle_put (bdev_handle); +blkdev_put (bdev_handle);return -EINVAL ; }put_device (&sdev->sdev_gendev);
@@ -2550,7 +2550,7 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev)return 0 ; out_mem: -blkdev_handle_put (bdev_handle); +blkdev_put (bdev_handle);/* This is safe: open() is still holding a reference. */ module_put (THIS_MODULE );return -ENOMEM ;
@@ -2757,7 +2757,7 @@ static int pkt_remove_dev(dev_t pkt_dev)pkt_debugfs_dev_remove (pd);pkt_sysfs_dev_remove (pd); -blkdev_handle_put (pd->bdev_handle); +blkdev_put (pd->bdev_handle);remove_proc_entry (pd->disk->disk_name, pkt_proc);dev_notice (ddev,"writer unmapped\n" );
drivers/block/rnbd/rnbd-srv.c +3 -4
@@ -219,7 +219,7 @@ void rnbd_destroy_sess_dev(struct rnbd_srv_sess_dev *sess_dev, bool keep_id)rnbd_put_sess_dev (sess_dev);wait_for_completion (&dc);/* wait for inflights to drop to zero */ -blkdev_handle_put (sess_dev->bdev_handle); +blkdev_put (sess_dev->bdev_handle);mutex_lock (&sess_dev->dev->lock);list_del (&sess_dev->dev_list);if (!sess_dev->readonly)
@@ -714,8 +714,7 @@ static int process_msg_open(struct rnbd_srv_session *srv_sess, goto reject; } - bdev_handle =blkdev_get_handle_by_path (full_path, open_flags,NULL , -NULL ); + bdev_handle =blkdev_get_by_path (full_path, open_flags,NULL ,NULL );if (IS_ERR (bdev_handle)) { ret =PTR_ERR (bdev_handle); pr_err("Opening device '%s' on session %s failed, failed to open the block device, err: %d\n",
@@ -792,7 +791,7 @@ static int process_msg_open(struct rnbd_srv_session *srv_sess, }rnbd_put_srv_dev (srv_dev); blkdev_put: -blkdev_handle_put (bdev_handle); +blkdev_put (bdev_handle); free_path:kfree (full_path); reject:
drivers/block/xen-blkback/xenbus.c +4 -3
@@ -474,7 +474,7 @@ static void xenvbd_sysfs_delif(struct xenbus_device *dev)static void xen_vbd_free (struct xen_vbd *vbd) {if (vbd->bdev_handle) -blkdev_handle_put (vbd->bdev_handle); +blkdev_put (vbd->bdev_handle); vbd->bdev_handle =NULL ; }
@@ -492,8 +492,9 @@ static int xen_vbd_create(struct xen_blkif *blkif, blkif_vdev_t handle, vbd->pdevice =MKDEV (major, minor); - bdev_handle =blkdev_get_handle_by_dev (vbd->pdevice, vbd->readonly ? -BLK_OPEN_READ :BLK_OPEN_WRITE ,NULL ,NULL ); + bdev_handle =blkdev_get_by_dev (vbd->pdevice, + vbd->readonly ?BLK_OPEN_READ :BLK_OPEN_WRITE , +NULL ,NULL );if (IS_ERR (bdev_handle)) { pr_warn("xen_vbd_create: device %08x could not be opened\n",
drivers/block/zram/zram_drv.c +5 -4
@@ -417,7 +417,7 @@ static void reset_bdev(struct zram *zram)if (!zram->backing_dev)return ; -blkdev_handle_put (zram->bdev_handle); +blkdev_put (zram->bdev_handle);/* hope filp_close flush all of IO */ filp_close (zram->backing_dev,NULL ); zram->backing_dev =NULL ;
@@ -504,8 +504,9 @@ static ssize_t backing_dev_store(struct device *dev, goto out; } - bdev_handle =blkdev_get_handle_by_dev (inode->i_rdev, -BLK_OPEN_READ |BLK_OPEN_WRITE , zram,NULL ); + bdev_handle =blkdev_get_by_dev (inode->i_rdev, +BLK_OPEN_READ |BLK_OPEN_WRITE , zram, +NULL );if (IS_ERR (bdev_handle)) { err =PTR_ERR (bdev_handle); bdev_handle =NULL ;
@@ -536,7 +537,7 @@ static ssize_t backing_dev_store(struct device *dev,kvfree (bitmap);if (bdev_handle) -blkdev_handle_put (bdev_handle); +blkdev_put (bdev_handle);if (backing_dev)filp_close (backing_dev,NULL );
drivers/md/bcache/super.c +12 -11
@@ -1369,7 +1369,7 @@ static void cached_dev_free(struct closure *cl)put_page (virt_to_page (dc->sb_disk));if (dc->bdev_handle) -blkdev_handle_put (dc->bdev_handle); +blkdev_put (dc->bdev_handle);wake_up (&unregister_wait);
@@ -2218,7 +2218,7 @@ void bch_cache_release(struct kobject *kobj)put_page (virt_to_page (ca->sb_disk));if (ca->bdev_handle) -blkdev_handle_put (ca->bdev_handle); +blkdev_put (ca->bdev_handle);kfree (ca);module_put (THIS_MODULE );
@@ -2357,10 +2357,10 @@ static int register_cache(struct cache_sb *sb, struct cache_sb_disk *sb_disk,/* * If we failed here, it means ca->kobj is not initialized yet, * kobject_put() won't be called and there is no chance to -* call blkdev_handle_put() to bdev in bch_cache_release(). So -* we explicitly call blkdev_handle_put() here. +* call blkdev_put() to bdev in bch_cache_release(). So we +* explicitly call blkdev_put() here. */ -blkdev_handle_put (bdev_handle); +blkdev_put (bdev_handle);if (ret == -ENOMEM ) err ="cache_alloc(): -ENOMEM" ;else if (ret == -EPERM )
@@ -2551,8 +2551,8 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr, ret = -EINVAL ; err ="failed to open device" ; - bdev_handle =blkdev_get_handle_by_path (strim (path),BLK_OPEN_READ , -NULL ,NULL ); + bdev_handle =blkdev_get_by_path (strim (path),BLK_OPEN_READ ,NULL , +NULL );if (IS_ERR (bdev_handle)) goto out_free_sb;
@@ -2572,9 +2572,10 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr, }/* Now reopen in exclusive mode with proper holder */ - bdev_handle2 =blkdev_get_handle_by_dev (bdev_handle->bdev->bd_dev, -BLK_OPEN_READ |BLK_OPEN_WRITE , holder,NULL ); -blkdev_handle_put (bdev_handle); + bdev_handle2 =blkdev_get_by_dev (bdev_handle->bdev->bd_dev, +BLK_OPEN_READ |BLK_OPEN_WRITE , + holder,NULL ); +blkdev_put (bdev_handle); bdev_handle = bdev_handle2;if (IS_ERR (bdev_handle)) { ret =PTR_ERR (bdev_handle);
@@ -2646,7 +2647,7 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr,put_page (virt_to_page (sb_disk)); out_blkdev_put:if (bdev_handle) -blkdev_handle_put (bdev_handle); +blkdev_put (bdev_handle); out_free_sb:kfree (sb); out_free_path:
drivers/md/dm.c +3 -3
@@ -751,7 +751,7 @@ static struct table_device *open_table_device(struct mapped_device *md,return ERR_PTR (-ENOMEM );refcount_set (&td->count,1 ); - bdev_handle =blkdev_get_handle_by_dev (dev, mode, _dm_claim_ptr,NULL ); + bdev_handle =blkdev_get_by_dev (dev, mode, _dm_claim_ptr,NULL );if (IS_ERR (bdev_handle)) { r =PTR_ERR (bdev_handle); goto out_free_td;
@@ -778,7 +778,7 @@ static struct table_device *open_table_device(struct mapped_device *md,return td; out_blkdev_put: -blkdev_handle_put (bdev_handle); +blkdev_put (bdev_handle); out_free_td:kfree (td);return ERR_PTR (r);
@@ -791,7 +791,7 @@ static void close_table_device(struct table_device *td, struct mapped_device *md {if (md->disk->slave_dir)bd_unlink_disk_holder (td->dm_dev.bdev, md->disk); -blkdev_handle_put (td->dm_dev.bdev_handle); +blkdev_put (td->dm_dev.bdev_handle);put_dax (td->dm_dev.dax_dev);list_del (&td->list);kfree (td);
drivers/md/md.c +6 -5
@@ -2458,7 +2458,7 @@ static void export_rdev(struct md_rdev *rdev, struct mddev *mddev)if (test_bit (AutoDetected, &rdev->flags))md_autodetect_dev (rdev->bdev->bd_dev);#endif -blkdev_handle_put (rdev->bdev_handle); +blkdev_put (rdev->bdev_handle); rdev->bdev =NULL ;kobject_put (&rdev->kobj); }
@@ -3654,9 +3654,10 @@ static struct md_rdev *md_import_device(dev_t newdev, int super_format, int supeif (err) goto out_clear_rdev; - rdev->bdev_handle =blkdev_get_handle_by_dev (newdev, -BLK_OPEN_READ |BLK_OPEN_WRITE , - super_format ==-2 ? &claim_rdev : rdev,NULL ); + rdev->bdev_handle =blkdev_get_by_dev (newdev, +BLK_OPEN_READ |BLK_OPEN_WRITE , + super_format ==-2 ? &claim_rdev : rdev, +NULL );if (IS_ERR (rdev->bdev_handle)) {pr_warn ("md: could not open device unknown-block(%u,%u).\n" ,MAJOR (newdev),MINOR (newdev));
@@ -3694,7 +3695,7 @@ static struct md_rdev *md_import_device(dev_t newdev, int super_format, int supereturn rdev; out_blkdev_put: -blkdev_handle_put (rdev->bdev_handle); +blkdev_put (rdev->bdev_handle); out_clear_rdev:md_rdev_clear (rdev); out_free_rdev:
drivers/mtd/devices/block2mtd.c +3 -4
@@ -213,7 +213,7 @@ static void block2mtd_free_device(struct block2mtd_dev *dev)if (dev->bdev_handle) {invalidate_mapping_pages ( dev->bdev_handle->bdev->bd_inode->i_mapping,0 ,-1 ); -blkdev_handle_put (dev->bdev_handle); +blkdev_put (dev->bdev_handle); }kfree (dev);
@@ -253,8 +253,7 @@ static struct bdev_handle __ref *mdtblock_early_get_bdev(const char *devname,wait_for_device_probe ();if (!early_lookup_bdev (devname, &devt)) { - bdev_handle =blkdev_get_handle_by_dev (devt, mode, dev, -NULL ); + bdev_handle =blkdev_get_by_dev (devt, mode, dev,NULL );if (!IS_ERR (bdev_handle))break ; }
@@ -280,7 +279,7 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size,return NULL ;/* Get a handle on the device */ - bdev_handle =blkdev_get_handle_by_path (devname, mode, dev,NULL ); + bdev_handle =blkdev_get_by_path (devname, mode, dev,NULL );if (IS_ERR (bdev_handle)) bdev_handle =mdtblock_early_get_bdev (devname, mode, timeout, dev);
drivers/nvme/target/io-cmd-bdev.c +4 -3
@@ -51,7 +51,7 @@ void nvmet_bdev_set_limits(struct block_device *bdev, struct nvme_id_ns *id)void nvmet_bdev_ns_disable (struct nvmet_ns *ns) {if (ns->bdev_handle) { -blkdev_handle_put (ns->bdev_handle); +blkdev_put (ns->bdev_handle); ns->bdev =NULL ; ns->bdev_handle =NULL ; }
@@ -85,8 +85,9 @@ int nvmet_bdev_ns_enable(struct nvmet_ns *ns)if (ns->buffered_io)return -ENOTBLK ; - ns->bdev_handle =blkdev_get_handle_by_path (ns->device_path, -BLK_OPEN_READ |BLK_OPEN_WRITE ,NULL ,NULL ); + ns->bdev_handle =blkdev_get_by_path (ns->device_path, +BLK_OPEN_READ |BLK_OPEN_WRITE , +NULL ,NULL );if (IS_ERR (ns->bdev_handle)) { ret =PTR_ERR (ns->bdev_handle);if (ret != -ENOTBLK ) {
drivers/s390/block/dasd_genhd.c +10 -10
@@ -130,8 +130,8 @@ int dasd_scan_partitions(struct dasd_block *block)struct bdev_handle *bdev_handle;int rc; - bdev_handle =blkdev_get_handle_by_dev (disk_devt (block->gdp), -BLK_OPEN_READ ,NULL ,NULL ); + bdev_handle =blkdev_get_by_dev (disk_devt (block->gdp),BLK_OPEN_READ , +NULL ,NULL );if (IS_ERR (bdev_handle)) { DBF_DEV_EVENT(DBF_ERR, block->base, "scan partitions error, blkdev_get returned %ld",
@@ -147,13 +147,13 @@ int dasd_scan_partitions(struct dasd_block *block) "scan partitions error, rc %d", rc);/* -* Since the matching blkdev_handle_put() call to the -* blkdev_get_handle_by_path() in this function is not called before -* dasd_destroy_partitions the offline open_count limit needs to be -* increased from 0 to 1. This is done by setting device->bdev_handle -* (see dasd_generic_set_offline). As long as the partition detection -* is running no offline should be allowed. That is why the assignment -* to block->bdev_handle is done AFTER the BLKRRPART ioctl. +* Since the matching blkdev_put() call to the blkdev_get_by_path() in +* this function is not called before dasd_destroy_partitions the +* offline open_count limit needs to be increased from 0 to 1. This is +* done by setting device->bdev_handle (see dasd_generic_set_offline). +* As long as the partition detection is running no offline should be +* allowed. That is why the assignment to block->bdev_handle is done +* AFTER the BLKRRPART ioctl. */ block->bdev_handle = bdev_handle;return 0 ;
@@ -179,7 +179,7 @@ void dasd_destroy_partitions(struct dasd_block *block)mutex_unlock (&bdev_handle->bdev->bd_disk->open_mutex);/* Matching blkdev_put to the blkdev_get in dasd_scan_partitions. */ -blkdev_handle_put (bdev_handle); +blkdev_put (bdev_handle); }int dasd_gendisk_init (void )
drivers/target/target_core_iblock.c +4 -4
@@ -117,8 +117,8 @@ static int iblock_configure_device(struct se_device *dev)else dev->dev_flags |=DF_READ_ONLY ; - bdev_handle =blkdev_get_handle_by_path (ib_dev->ibd_udev_path, mode, - ib_dev,NULL ); + bdev_handle =blkdev_get_by_path (ib_dev->ibd_udev_path, mode, ib_dev, +NULL );if (IS_ERR (bdev_handle)) { ret =PTR_ERR (bdev_handle); goto out_free_bioset;
@@ -180,7 +180,7 @@ static int iblock_configure_device(struct se_device *dev)return 0 ; out_blkdev_put: -blkdev_handle_put (ib_dev->ibd_bdev_handle); +blkdev_put (ib_dev->ibd_bdev_handle); out_free_bioset:bioset_exit (&ib_dev->ibd_bio_set); out:
@@ -206,7 +206,7 @@ static void iblock_destroy_device(struct se_device *dev)struct iblock_dev *ib_dev =IBLOCK_DEV (dev);if (ib_dev->ibd_bdev_handle) -blkdev_handle_put (ib_dev->ibd_bdev_handle); +blkdev_put (ib_dev->ibd_bdev_handle);bioset_exit (&ib_dev->ibd_bio_set); }
drivers/target/target_core_pscsi.c +6 -5
@@ -366,10 +366,11 @@ static int pscsi_create_type_disk(struct se_device *dev, struct scsi_device *sd)* Claim exclusive struct block_device access to struct scsi_device * for TYPE_DISK and TYPE_ZBC using supplied udev_path */ - bdev_handle =blkdev_get_handle_by_path (dev->udev_path, -BLK_OPEN_WRITE |BLK_OPEN_READ , pdv,NULL ); + bdev_handle =blkdev_get_by_path (dev->udev_path, +BLK_OPEN_WRITE |BLK_OPEN_READ , pdv, +NULL );if (IS_ERR (bdev_handle)) { -pr_err ("pSCSI: blkdev_get_handle_by_path() failed\n" ); +pr_err ("pSCSI: blkdev_get_by_path() failed\n" );scsi_device_put (sd);return PTR_ERR (bdev_handle); }
@@ -377,7 +378,7 @@ static int pscsi_create_type_disk(struct se_device *dev, struct scsi_device *sd) ret =pscsi_add_device_to_list (dev, sd);if (ret) { -blkdev_handle_put (bdev_handle); +blkdev_put (bdev_handle);scsi_device_put (sd);return ret; }
@@ -565,7 +566,7 @@ static void pscsi_destroy_device(struct se_device *dev)*/ if ((sd->type ==TYPE_DISK || sd->type ==TYPE_ZBC ) && pdv->pdv_bdev_handle) { -blkdev_handle_put (pdv->pdv_bdev_handle); +blkdev_put (pdv->pdv_bdev_handle); pdv->pdv_bdev_handle =NULL ; }/*
fs/btrfs/dev-replace.c +3 -3
@@ -258,8 +258,8 @@ static int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,return -EINVAL ; } - bdev_handle =blkdev_get_handle_by_path (device_path,BLK_OPEN_WRITE , - fs_info->bdev_holder,NULL ); + bdev_handle =blkdev_get_by_path (device_path,BLK_OPEN_WRITE , + fs_info->bdev_holder,NULL );if (IS_ERR (bdev_handle)) {btrfs_err (fs_info,"target device %s is invalid!" , device_path);return PTR_ERR (bdev_handle);
@@ -336,7 +336,7 @@ static int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,return 0 ; error: -blkdev_handle_put (bdev_handle); +blkdev_put (bdev_handle);return ret; }
fs/btrfs/ioctl.c +2 -2
@@ -2722,7 +2722,7 @@ static long btrfs_ioctl_rm_dev_v2(struct file *file, void __user *arg) err_drop:mnt_drop_write_file (file);if (bdev_handle) -blkdev_handle_put (bdev_handle); +blkdev_put (bdev_handle); out:btrfs_put_dev_args_from_path (&args);kfree (vol_args);
@@ -2770,7 +2770,7 @@ static long btrfs_ioctl_rm_dev(struct file *file, void __user *arg)mnt_drop_write_file (file);if (bdev_handle) -blkdev_handle_put (bdev_handle); +blkdev_put (bdev_handle); out:btrfs_put_dev_args_from_path (&args);kfree (vol_args);
fs/btrfs/volumes.c +15 -16
@@ -517,8 +517,7 @@ btrfs_get_bdev_and_sb(const char *device_path, blk_mode_t flags, void *holder,struct block_device *bdev;int ret; - *bdev_handle =blkdev_get_handle_by_path (device_path, flags, holder, -NULL ); + *bdev_handle =blkdev_get_by_path (device_path, flags, holder,NULL );if (IS_ERR (*bdev_handle)) { ret =PTR_ERR (*bdev_handle);
@@ -530,14 +529,14 @@ btrfs_get_bdev_and_sb(const char *device_path, blk_mode_t flags, void *holder,sync_blockdev (bdev); ret =set_blocksize (bdev,BTRFS_BDEV_BLOCKSIZE );if (ret) { -blkdev_handle_put (*bdev_handle); +blkdev_put (*bdev_handle); goto error; }invalidate_bdev (bdev); *disk_super =btrfs_read_dev_super (bdev);if (IS_ERR (*disk_super)) { ret =PTR_ERR (*disk_super); -blkdev_handle_put (*bdev_handle); +blkdev_put (*bdev_handle); goto error; }
@@ -679,7 +678,7 @@ static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices, error_free_page:btrfs_release_disk_super (disk_super); -blkdev_handle_put (bdev_handle); +blkdev_put (bdev_handle);return -EINVAL ; }
@@ -1070,7 +1069,7 @@ static void __btrfs_free_extra_devids(struct btrfs_fs_devices *fs_devices,continue ;if (device->bdev_handle) { -blkdev_handle_put (device->bdev_handle); +blkdev_put (device->bdev_handle); device->bdev =NULL ; device->bdev_handle =NULL ; fs_devices->open_devices--;
@@ -1117,7 +1116,7 @@ static void btrfs_close_bdev(struct btrfs_device *device)invalidate_bdev (device->bdev); } -blkdev_handle_put (device->bdev_handle); +blkdev_put (device->bdev_handle); }static void btrfs_close_one_device (struct btrfs_device *device)
@@ -1388,7 +1387,7 @@ struct btrfs_device *btrfs_scan_one_device(const char *path, blk_mode_t flags)* values temporarily, as the device paths of the fsid are the only * required information for assembling the volume. */ - bdev_handle =blkdev_get_handle_by_path (path, flags,NULL ,NULL ); + bdev_handle =blkdev_get_by_path (path, flags,NULL ,NULL );if (IS_ERR (bdev_handle))return ERR_CAST (bdev_handle);
@@ -1413,7 +1412,7 @@ struct btrfs_device *btrfs_scan_one_device(const char *path, blk_mode_t flags)btrfs_release_disk_super (disk_super); error_bdev_put: -blkdev_handle_put (bdev_handle); +blkdev_put (bdev_handle);return device; }
@@ -2225,9 +2224,9 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info,* free the device. * * We cannot call btrfs_close_bdev() here because we're holding the sb -* write lock, and blkdev_handle_put() will pull in the ->open_mutex on -* the block device and it's dependencies. Instead just flush the -* device and let the caller do the final blkdev_handle_put. +* write lock, and blkdev_put() will pull in the ->open_mutex on the +* block device and it's dependencies. Instead just flush the device +* and let the caller do the final blkdev_put. */ if (test_bit (BTRFS_DEV_STATE_WRITEABLE , &device->dev_state)) { btrfs_scratch_superblocks(fs_info, device->bdev,
@@ -2406,7 +2405,7 @@ int btrfs_get_dev_args_from_path(struct btrfs_fs_info *fs_info,else memcpy (args->fsid, disk_super->fsid,BTRFS_FSID_SIZE );btrfs_release_disk_super (disk_super); -blkdev_handle_put (bdev_handle); +blkdev_put (bdev_handle);return 0 ; }
@@ -2639,8 +2638,8 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_pathif (sb_rdonly (sb) && !fs_devices->seeding)return -EROFS ; - bdev_handle =blkdev_get_handle_by_path (device_path,BLK_OPEN_WRITE , - fs_info->bdev_holder,NULL ); + bdev_handle =blkdev_get_by_path (device_path,BLK_OPEN_WRITE , + fs_info->bdev_holder,NULL );if (IS_ERR (bdev_handle))return PTR_ERR (bdev_handle);
@@ -2860,7 +2859,7 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path error_free_device:btrfs_free_device (device); error: -blkdev_handle_put (bdev_handle); +blkdev_put (bdev_handle);if (locked) {mutex_unlock (&uuid_mutex);up_write (&sb->s_umount);
fs/erofs/super.c +3 -3
@@ -254,8 +254,8 @@ static int erofs_init_device(struct erofs_buf *buf, struct super_block *sb,return PTR_ERR (fscache); dif->fscache = fscache; }else if (!sbi->devs->flatdev) { - bdev_handle =blkdev_get_handle_by_path (dif->path, -BLK_OPEN_READ , sb->s_type,NULL ); + bdev_handle =blkdev_get_by_path (dif->path,BLK_OPEN_READ , + sb->s_type,NULL );if (IS_ERR (bdev_handle))return PTR_ERR (bdev_handle); dif->bdev_handle = bdev_handle;
@@ -816,7 +816,7 @@ static int erofs_release_device_info(int id, void *ptr, void *data)fs_put_dax (dif->dax_dev,NULL );if (dif->bdev_handle) -blkdev_handle_put (dif->bdev_handle); +blkdev_put (dif->bdev_handle);erofs_fscache_unregister_cookie (dif->fscache); dif->fscache =NULL ;kfree (dif->path);
fs/ext4/super.c +4 -4
@@ -1112,8 +1112,8 @@ static struct bdev_handle *ext4_blkdev_get(dev_t dev, struct super_block *sb) {struct bdev_handle *handle; - handle =blkdev_get_handle_by_dev (dev,BLK_OPEN_READ |BLK_OPEN_WRITE , - sb, &ext4_holder_ops); + handle =blkdev_get_by_dev (dev,BLK_OPEN_READ |BLK_OPEN_WRITE , sb, + &ext4_holder_ops);if (IS_ERR (handle)) goto fail;return handle;
@@ -1137,7 +1137,7 @@ static void ext4_blkdev_remove(struct ext4_sb_info *sbi)* hotswapped, and it breaks the `ro-after' testing code. */ invalidate_bdev (sbi->s_journal_bdev_handle->bdev); -blkdev_handle_put (sbi->s_journal_bdev_handle); +blkdev_put (sbi->s_journal_bdev_handle); sbi->s_journal_bdev_handle =NULL ; } }
@@ -5928,7 +5928,7 @@ static journal_t *ext4_get_dev_journal(struct super_block *sb, out_journal:jbd2_journal_destroy (journal); out_bdev: -blkdev_handle_put (bdev_handle); +blkdev_put (bdev_handle);return NULL ; }
fs/f2fs/super.c +9 -6
@@ -1538,7 +1538,7 @@ static void destroy_device_list(struct f2fs_sb_info *sbi)int i;for (i =0 ; i < sbi->s_ndevs; i++) { -blkdev_handle_put (FDEV (i).bdev_handle); +blkdev_put (FDEV (i).bdev_handle);#ifdef CONFIG_BLK_DEV_ZONED kvfree (FDEV (i).blkz_seq);#endif
@@ -4024,9 +4024,10 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)if (max_devices ==1 ) {/* Single zoned block device mount */ -FDEV (0 ).bdev_handle =blkdev_get_handle_by_dev ( - sbi->sb->s_bdev->bd_dev, - mode, sbi->sb->s_type,NULL ); +FDEV (0 ).bdev_handle =blkdev_get_by_dev (sbi->sb->s_bdev->bd_dev, + mode, + sbi->sb->s_type, +NULL ); }else {/* Multi-device mount */ memcpy (FDEV (i).path,RDEV (i).path,MAX_PATH_LEN );
@@ -4044,8 +4045,10 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi) (FDEV (i).total_segments << sbi->log_blocks_per_seg) -1 ; } -FDEV (i).bdev_handle =blkdev_get_handle_by_path ( -FDEV (i).path, mode, sbi->sb->s_type,NULL ); +FDEV (i).bdev_handle =blkdev_get_by_path (FDEV (i).path, + mode, + sbi->sb->s_type, +NULL ); }if (IS_ERR (FDEV (i).bdev_handle))return PTR_ERR (FDEV (i).bdev_handle);
fs/jfs/jfs_logmgr.c +5 -4
@@ -1100,8 +1100,9 @@ int lmLogOpen(struct super_block *sb)* file systems to log may have n-to-1 relationship; */ - bdev_handle =blkdev_get_handle_by_dev (sbi->logdev, -BLK_OPEN_READ |BLK_OPEN_WRITE , log,NULL ); + bdev_handle =blkdev_get_by_dev (sbi->logdev, +BLK_OPEN_READ |BLK_OPEN_WRITE , log, +NULL );if (IS_ERR (bdev_handle)) { rc =PTR_ERR (bdev_handle); goto free;
@@ -1141,7 +1142,7 @@ int lmLogOpen(struct super_block *sb)lbmLogShutdown (log); close:/* close external log device */ -blkdev_handle_put (bdev_handle); +blkdev_put (bdev_handle); free:/* free log descriptor */ mutex_unlock (&jfs_log_mutex);
@@ -1485,7 +1486,7 @@ int lmLogClose(struct super_block *sb) bdev_handle = log->bdev_handle; rc =lmLogShutdown (log); -blkdev_handle_put (bdev_handle); +blkdev_put (bdev_handle);kfree (log);
fs/nfs/blocklayout/dev.c +7 -6
@@ -35,7 +35,7 @@ bl_free_device(struct pnfs_block_dev *dev) }if (dev->bdev_handle) -blkdev_handle_put (dev->bdev_handle); +blkdev_put (dev->bdev_handle); } }
@@ -243,8 +243,8 @@ bl_parse_simple(struct nfs_server *server, struct pnfs_block_dev *d,if (!dev)return -EIO ; - bdev_handle =blkdev_get_handle_by_dev (dev, -BLK_OPEN_READ |BLK_OPEN_WRITE ,NULL ,NULL ); + bdev_handle =blkdev_get_by_dev (dev,BLK_OPEN_READ |BLK_OPEN_WRITE , +NULL ,NULL );if (IS_ERR (bdev_handle)) {printk (KERN_WARNING "pNFS: failed to open device %d:%d (%ld)\n" ,MAJOR (dev),MINOR (dev),PTR_ERR (bdev_handle));
@@ -311,8 +311,9 @@ bl_open_path(struct pnfs_block_volume *v, const char *prefix)if (!devname)return ERR_PTR (-ENOMEM ); - bdev_handle =blkdev_get_handle_by_path (devname, -BLK_OPEN_READ |BLK_OPEN_WRITE ,NULL ,NULL ); + bdev_handle =blkdev_get_by_path (devname, +BLK_OPEN_READ |BLK_OPEN_WRITE ,NULL , +NULL );if (IS_ERR (bdev_handle)) {pr_warn ("pNFS: failed to open device %s (%ld)\n" , devname,PTR_ERR (bdev_handle));
@@ -373,7 +374,7 @@ bl_parse_scsi(struct nfs_server *server, struct pnfs_block_dev *d,return 0 ; out_blkdev_put: -blkdev_handle_put (d->bdev_handle); +blkdev_put (d->bdev_handle);return error; }
fs/nilfs2/super.c +4 -4
@@ -1304,8 +1304,8 @@ nilfs_mount(struct file_system_type *fs_type, int flags,struct dentry *root_dentry;int err, s_new = false; - bdev_handle =blkdev_get_handle_by_path (dev_name,sb_open_mode (flags), - fs_type,NULL ); + bdev_handle =blkdev_get_by_path (dev_name,sb_open_mode (flags), + fs_type,NULL );if (IS_ERR (bdev_handle))return ERR_CAST (bdev_handle);
@@ -1377,7 +1377,7 @@ nilfs_mount(struct file_system_type *fs_type, int flags, }if (!s_new) -blkdev_handle_put (bdev_handle); +blkdev_put (bdev_handle);return root_dentry;
@@ -1386,7 +1386,7 @@ nilfs_mount(struct file_system_type *fs_type, int flags, failed:if (!s_new) -blkdev_handle_put (bdev_handle); +blkdev_put (bdev_handle);return ERR_PTR (err); }
fs/ocfs2/cluster/heartbeat.c +5 -5
@@ -1510,7 +1510,7 @@ static void o2hb_region_release(struct config_item *item) }if (reg->hr_bdev_handle) -blkdev_handle_put (reg->hr_bdev_handle); +blkdev_put (reg->hr_bdev_handle);kfree (reg->hr_slots);
@@ -1795,9 +1795,9 @@ static ssize_t o2hb_region_dev_store(struct config_item *item,if (!S_ISBLK (f.file->f_mapping->host->i_mode)) goto out2; - reg->hr_bdev_handle =blkdev_get_handle_by_dev ( - f.file->f_mapping->host->i_rdev, -BLK_OPEN_WRITE |BLK_OPEN_READ ,NULL ,NULL ); + reg->hr_bdev_handle =blkdev_get_by_dev (f.file->f_mapping->host->i_rdev, +BLK_OPEN_WRITE |BLK_OPEN_READ , +NULL ,NULL );if (IS_ERR (reg->hr_bdev_handle)) { ret =PTR_ERR (reg->hr_bdev_handle); reg->hr_bdev_handle =NULL ;
@@ -1904,7 +1904,7 @@ static ssize_t o2hb_region_dev_store(struct config_item *item, out3:if (ret <0 ) { -blkdev_handle_put (reg->hr_bdev_handle); +blkdev_put (reg->hr_bdev_handle); reg->hr_bdev_handle =NULL ; } out2:
fs/reiserfs/journal.c +5 -5
@@ -2587,7 +2587,7 @@ static void journal_list_init(struct super_block *sb)static void release_journal_dev (struct reiserfs_journal *journal) {if (journal->j_bdev_handle) { -blkdev_handle_put (journal->j_bdev_handle); +blkdev_put (journal->j_bdev_handle); journal->j_bdev_handle =NULL ; } }
@@ -2614,8 +2614,8 @@ static int journal_init_dev(struct super_block *super,if ((!jdev_name || !jdev_name[0 ])) {if (jdev == super->s_dev) holder =NULL ; - journal->j_bdev_handle =blkdev_get_handle_by_dev (jdev, - blkdev_mode, holder,NULL ); + journal->j_bdev_handle =blkdev_get_by_dev (jdev, blkdev_mode, + holder,NULL );if (IS_ERR (journal->j_bdev_handle)) { result =PTR_ERR (journal->j_bdev_handle); journal->j_bdev_handle =NULL ;
@@ -2630,8 +2630,8 @@ static int journal_init_dev(struct super_block *super,return 0 ; } - journal->j_bdev_handle =blkdev_get_handle_by_path (jdev_name, - blkdev_mode, holder,NULL ); + journal->j_bdev_handle =blkdev_get_by_path (jdev_name, blkdev_mode, + holder,NULL );if (IS_ERR (journal->j_bdev_handle)) { result =PTR_ERR (journal->j_bdev_handle); journal->j_bdev_handle =NULL ;
fs/super.c +18 -20
@@ -1266,9 +1266,9 @@ int get_tree_bdev(struct fs_context *fc,if (!fc->source)return invalf (fc,"No source specified" ); - bdev_handle =blkdev_get_handle_by_path (fc->source, -sb_open_mode (fc->sb_flags), fc->fs_type, - &fs_holder_ops); + bdev_handle =blkdev_get_by_path (fc->source, +sb_open_mode (fc->sb_flags), + fc->fs_type, &fs_holder_ops);if (IS_ERR (bdev_handle)) {errorf (fc,"%s: Can't open blockdev" , fc->source);return PTR_ERR (bdev_handle);
@@ -1283,7 +1283,7 @@ int get_tree_bdev(struct fs_context *fc,if (bdev->bd_fsfreeze_count >0 ) {mutex_unlock (&bdev->bd_fsfreeze_mutex);warnf (fc,"%pg: Can't mount, blockdev is frozen" , bdev); -blkdev_handle_put (bdev_handle); +blkdev_put (bdev_handle);return -EBUSY ; }
@@ -1292,7 +1292,7 @@ int get_tree_bdev(struct fs_context *fc, s =sget_fc (fc, test_bdev_super_fc, set_bdev_super_fc);mutex_unlock (&bdev->bd_fsfreeze_mutex);if (IS_ERR (s)) { -blkdev_handle_put (bdev_handle); +blkdev_put (bdev_handle);return PTR_ERR (s); }
@@ -1301,19 +1301,18 @@ int get_tree_bdev(struct fs_context *fc,if ((fc->sb_flags ^ s->s_flags) &SB_RDONLY ) {warnf (fc,"%pg: Can't mount, would change RO state" , bdev);deactivate_locked_super (s); -blkdev_handle_put (bdev_handle); +blkdev_put (bdev_handle);return -EBUSY ; }/* * s_umount nests inside open_mutex during -* __invalidate_device(). blkdev_handle_put() acquires -* open_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 open_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); -blkdev_handle_put (bdev_handle); +blkdev_put (bdev_handle);down_write (&s->s_umount); }else {snprintf (s->s_id,sizeof (s->s_id),"%pg" , bdev);
@@ -1351,8 +1350,8 @@ struct dentry *mount_bdev(struct file_system_type *fs_type,struct super_block *s;int error =0 ; - bdev_handle =blkdev_get_handle_by_path (dev_name,sb_open_mode (flags), - fs_type, &fs_holder_ops); + bdev_handle =blkdev_get_by_path (dev_name,sb_open_mode (flags), + fs_type, &fs_holder_ops);if (IS_ERR (bdev_handle))return ERR_CAST (bdev_handle); bdev = bdev_handle->bdev;
@@ -1383,13 +1382,12 @@ struct dentry *mount_bdev(struct file_system_type *fs_type,/* * s_umount nests inside open_mutex during -* __invalidate_device(). blkdev_handle_put() acquires -* open_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 open_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); -blkdev_handle_put (bdev_handle); +blkdev_put (bdev_handle);down_write (&s->s_umount); }else {snprintf (s->s_id,sizeof (s->s_id),"%pg" , bdev);
@@ -1411,7 +1409,7 @@ struct dentry *mount_bdev(struct file_system_type *fs_type, error_s: error =PTR_ERR (s); error_bdev: -blkdev_handle_put (bdev_handle); +blkdev_put (bdev_handle); error:return ERR_PTR (error); }
@@ -1424,7 +1422,7 @@ void kill_block_super(struct super_block *sb) bdev->bd_super =NULL ;generic_shutdown_super (sb);sync_blockdev (bdev); -blkdev_handle_put (sb->s_bdev_handle); +blkdev_put (sb->s_bdev_handle); }EXPORT_SYMBOL (kill_block_super);
fs/xfs/xfs_super.c +3 -3
@@ -396,8 +396,8 @@ xfs_blkdev_get( {int error =0 ; - *handlep =blkdev_get_handle_by_path (name, -BLK_OPEN_READ |BLK_OPEN_WRITE , mp, &xfs_holder_ops); + *handlep =blkdev_get_by_path (name,BLK_OPEN_READ |BLK_OPEN_WRITE , + mp, &xfs_holder_ops);if (IS_ERR (*handlep)) { error =PTR_ERR (*handlep);xfs_warn (mp,"Invalid device [%s], error=%d" , name, error);
@@ -411,7 +411,7 @@ xfs_blkdev_put( struct bdev_handle *handle) {if (handle) -blkdev_handle_put (handle); +blkdev_put (handle); }STATIC void
include/linux/blkdev.h +4 -4
@@ -1476,14 +1476,14 @@ struct bdev_handle {void *holder; }; -struct bdev_handle *blkdev_get_handle_by_dev (dev_t dev,blk_mode_t mode, -void *holder,const struct blk_holder_ops *hops); -struct bdev_handle *blkdev_get_handle_by_path (const char *path,blk_mode_t mode, +struct bdev_handle *blkdev_get_by_dev (dev_t dev,blk_mode_t mode,void *holder, +const struct blk_holder_ops *hops); +struct bdev_handle *blkdev_get_by_path (const char *path,blk_mode_t mode,void *holder,const struct blk_holder_ops *hops);int bd_prepare_to_claim (struct block_device *bdev,void *holder,const struct blk_holder_ops *hops);void bd_abort_claiming (struct block_device *bdev,void *holder); -void blkdev_handle_put (struct bdev_handle *handle); +void blkdev_put (struct bdev_handle *handle);/* just for blk-cgroup, don't use elsewhere */ struct block_device *blkdev_get_no_open (dev_t dev);
kernel/power/swap.c +8 -7
@@ -357,14 +357,14 @@ static int swsusp_swap_check(void)return res; root_swap = res; - hib_resume_bdev_handle =blkdev_get_handle_by_dev (swsusp_resume_device, -BLK_OPEN_WRITE ,NULL ,NULL ); + hib_resume_bdev_handle =blkdev_get_by_dev (swsusp_resume_device, +BLK_OPEN_WRITE ,NULL ,NULL );if (IS_ERR (hib_resume_bdev_handle))return PTR_ERR (hib_resume_bdev_handle); res =set_blocksize (hib_resume_bdev_handle->bdev,PAGE_SIZE );if (res <0 ) -blkdev_handle_put (hib_resume_bdev_handle); +blkdev_put (hib_resume_bdev_handle);return res; }
@@ -1522,8 +1522,9 @@ int swsusp_check(bool snapshot_test)void *holder = snapshot_test ? &swsusp_holder :NULL ;int error; - hib_resume_bdev_handle =blkdev_get_handle_by_dev (swsusp_resume_device, -BLK_OPEN_READ , holder,NULL ); + hib_resume_bdev_handle =blkdev_get_by_dev (swsusp_resume_device, +BLK_OPEN_READ , holder, +NULL );if (!IS_ERR (hib_resume_bdev_handle)) {set_blocksize (hib_resume_bdev_handle->bdev,PAGE_SIZE );clear_page (swsusp_header);
@@ -1550,7 +1551,7 @@ int swsusp_check(bool snapshot_test) put:if (error) -blkdev_handle_put (hib_resume_bdev_handle); +blkdev_put (hib_resume_bdev_handle);else pr_debug ("Image signature found, resuming\n" ); }else {
@@ -1574,7 +1575,7 @@ void swsusp_close(void)return ; } -blkdev_handle_put (hib_resume_bdev_handle); +blkdev_put (hib_resume_bdev_handle); }/**
mm/swapfile.c +5 -4
@@ -2528,7 +2528,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile) inode = mapping->host;if (p->bdev_handle) {set_blocksize (p->bdev, old_block_size); -blkdev_handle_put (p->bdev_handle); +blkdev_put (p->bdev_handle); }inode_lock (inode);
@@ -2758,8 +2758,9 @@ static int claim_swapfile(struct swap_info_struct *p, struct inode *inode)int error;if (S_ISBLK (inode->i_mode)) { - p->bdev_handle =blkdev_get_handle_by_dev (inode->i_rdev, -BLK_OPEN_READ |BLK_OPEN_WRITE , p,NULL ); + p->bdev_handle =blkdev_get_by_dev (inode->i_rdev, +BLK_OPEN_READ |BLK_OPEN_WRITE , + p,NULL );if (IS_ERR (p->bdev_handle)) { error =PTR_ERR (p->bdev_handle); p->bdev_handle =NULL ;
@@ -3211,7 +3212,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) p->cluster_next_cpu =NULL ;if (p->bdev_handle) {set_blocksize (p->bdev, p->old_block_size); -blkdev_handle_put (p->bdev_handle); +blkdev_put (p->bdev_handle); } inode =NULL ;destroy_swap_extents (p);
Signature · 1 line
2.35.3
Quoted 10 lines · Jan Kara
Hello,
this patch series implements the idea of blkdev_get_by_*() calls returning
bdev_handlewhich is then passed toblkdev_put()[1]. This makes the get and put calls for bdevs more obviously matching and allows us to propagate context from get to put without having to modify all the users (again!). In particular I need to propagate used open flags toblkdev_put()to be able count writeable opens and add support for blocking writes to mounted block devices. I'll send that series separately.
Quoted 3 lines
The series is based on Linus' tree as of yesterday + two bcache fixes which are in the block tree. Patches have passed some basic testing, I plan to test more users once we agree this is the right way to go.
Can you post a link to a git branch for this and the follow up series? Especially with a fairly unstable base it's kinda hard to look at the result otherwise.