Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-01 10:42:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bdev: remove bdev pointer from struct bdev_handle

Browse Source 
We can always go directly via:

* I_BDEV(bdev_file->f_inode)
* I_BDEV(bdev_file->f_mapping->host)

So keeping struct bdev in struct bdev_handle is redundant.

Link: https://lore.kernel.org/r/20240123-vfs-bdev-file-v2-30-adbd023e19cc@kernel.org
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Christian Brauner 2024-01-23 14:26:47 +01:00
parent a56aefca8d
commit 7c09a4ed61
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
3 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
block/bdev.c
View File

@ -51,8 +51,7 @@ EXPORT_SYMBOL(I_BDEV);
struct block_device *file_bdev(struct file *bdev_file) struct block_device *file_bdev(struct file *bdev_file)
{ {
struct bdev_handle *handle = bdev_file->private_data; return I_BDEV(bdev_file->f_mapping->host);
return handle->bdev;
} }
EXPORT_SYMBOL(file_bdev); EXPORT_SYMBOL(file_bdev);
@ -891,7 +890,6 @@ int bdev_open(struct block_device *bdev, blk_mode_t mode, void *holder,
if (unblock_events) if (unblock_events)
disk_unblock_events(disk); disk_unblock_events(disk);
handle->bdev = bdev;
handle->holder = holder; handle->holder = holder;
handle->mode = mode; handle->mode = mode;
@ -899,7 +897,7 @@ int bdev_open(struct block_device *bdev, blk_mode_t mode, void *holder,
bdev_file->f_mode |= FMODE_BUF_RASYNC | FMODE_CAN_ODIRECT; bdev_file->f_mode |= FMODE_BUF_RASYNC | FMODE_CAN_ODIRECT;
if (bdev_nowait(bdev)) if (bdev_nowait(bdev))
bdev_file->f_mode |= FMODE_NOWAIT; bdev_file->f_mode |= FMODE_NOWAIT;
bdev_file->f_mapping = handle->bdev->bd_inode->i_mapping; bdev_file->f_mapping = bdev->bd_inode->i_mapping;
bdev_file->f_wb_err = filemap_sample_wb_err(bdev_file->f_mapping); bdev_file->f_wb_err = filemap_sample_wb_err(bdev_file->f_mapping);
bdev_file->private_data = handle; bdev_file->private_data = handle;
@ -985,7 +983,7 @@ struct file *bdev_file_open_by_path(const char *path, blk_mode_t mode,
void *holder, void *holder,
const struct blk_holder_ops *hops) const struct blk_holder_ops *hops)
{ {
struct file *bdev_file; struct file *file;
dev_t dev; dev_t dev;
int error; int error;
@ -993,22 +991,22 @@ struct file *bdev_file_open_by_path(const char *path, blk_mode_t mode,
if (error) if (error)
return ERR_PTR(error); return ERR_PTR(error);
bdev_file = bdev_file_open_by_dev(dev, mode, holder, hops); file = bdev_file_open_by_dev(dev, mode, holder, hops);
if (!IS_ERR(bdev_file) && (mode & BLK_OPEN_WRITE)) { if (!IS_ERR(file) && (mode & BLK_OPEN_WRITE)) {
struct bdev_handle *handle = bdev_file->private_data; if (bdev_read_only(file_bdev(file))) {
if (bdev_read_only(handle->bdev)) { fput(file);
fput(bdev_file); file = ERR_PTR(-EACCES);
bdev_file = ERR_PTR(-EACCES);
} }
} }
return bdev_file; return file;
} }
EXPORT_SYMBOL(bdev_file_open_by_path); EXPORT_SYMBOL(bdev_file_open_by_path);
void bdev_release(struct bdev_handle *handle) void bdev_release(struct file *bdev_file)
{ {
struct block_device *bdev = handle->bdev; struct block_device *bdev = file_bdev(bdev_file);
struct bdev_handle *handle = bdev_file->private_data;
struct gendisk *disk = bdev->bd_disk; struct gendisk *disk = bdev->bd_disk;
/* /*

3
block/blk.h
View File

@ -26,7 +26,6 @@ struct blk_flush_queue {
}; };
struct bdev_handle { struct bdev_handle {
struct block_device *bdev;
void *holder; void *holder;
blk_mode_t mode; blk_mode_t mode;
}; };
@ -522,7 +521,7 @@ static inline int req_ref_read(struct request *req)
return atomic_read(&req->ref); return atomic_read(&req->ref);
} }
void bdev_release(struct bdev_handle *handle); void bdev_release(struct file *bdev_file);
int bdev_open(struct block_device *bdev, blk_mode_t mode, void *holder, int bdev_open(struct block_device *bdev, blk_mode_t mode, void *holder,
const struct blk_holder_ops *hops, struct file *bdev_file); const struct blk_holder_ops *hops, struct file *bdev_file);
int bdev_permission(dev_t dev, blk_mode_t mode, void *holder); int bdev_permission(dev_t dev, blk_mode_t mode, void *holder);

2
block/fops.c
View File

@ -623,7 +623,7 @@ static int blkdev_open(struct inode *inode, struct file *filp)
static int blkdev_release(struct inode *inode, struct file *filp) static int blkdev_release(struct inode *inode, struct file *filp)
{ {
if (filp->private_data) if (filp->private_data)
bdev_release(filp->private_data); bdev_release(filp);
return 0; return 0;
} }