mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-28 21:33:52 +00:00
Code Issues Releases Wiki Activity

block: add a sb_open_mode helper

Browse source 
Add a helper to return the open flags for blkdev_get_by* for passed in
super block flags instead of open coding the logic in many places.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Acked-by: Christian Brauner <brauner@kernel.org>
Link: https://lore.kernel.org/r/20230608110258.189493-17-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2023-06-08 13:02:44 +02:00 committed by Jens Axboe
parent 2736e8eeb0
commit 3f0b3e785e
4 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs/btrfs/super.c
View file

@ -1440,12 +1440,9 @@ static struct dentry *btrfs_mount_root(struct file_system_type *fs_type,
struct btrfs_fs_devices *fs_devices = NULL; struct btrfs_fs_devices *fs_devices = NULL;
struct btrfs_fs_info *fs_info = NULL; struct btrfs_fs_info *fs_info = NULL;
void *new_sec_opts = NULL; void *new_sec_opts = NULL;
fmode_t mode = FMODE_READ; fmode_t mode = sb_open_mode(flags);
int error = 0; int error = 0;
if (!(flags & SB_RDONLY))
mode |= FMODE_WRITE;
if (data) { if (data) {
error = security_sb_eat_lsm_opts(data, &new_sec_opts); error = security_sb_eat_lsm_opts(data, &new_sec_opts);
if (error) if (error)

7
fs/nilfs2/super.c
View file

@ -1278,14 +1278,11 @@ nilfs_mount(struct file_system_type *fs_type, int flags,
{ {
struct nilfs_super_data sd; struct nilfs_super_data sd;
struct super_block *s; struct super_block *s;
fmode_t mode = FMODE_READ;
struct dentry *root_dentry; struct dentry *root_dentry;
int err, s_new = false; int err, s_new = false;
if (!(flags & SB_RDONLY)) sd.bdev = blkdev_get_by_path(dev_name, sb_open_mode(flags), fs_type,
mode |= FMODE_WRITE; NULL);
sd.bdev = blkdev_get_by_path(dev_name, mode, fs_type, NULL);
if (IS_ERR(sd.bdev)) if (IS_ERR(sd.bdev))
return ERR_CAST(sd.bdev); return ERR_CAST(sd.bdev);

15
fs/super.c
View file

@ -1255,17 +1255,13 @@ int get_tree_bdev(struct fs_context *fc,
{ {
struct block_device *bdev; struct block_device *bdev;
struct super_block *s; struct super_block *s;
fmode_t mode = FMODE_READ;
int error = 0; int error = 0;
if (!(fc->sb_flags & SB_RDONLY))
mode |= FMODE_WRITE;
if (!fc->source) if (!fc->source)
return invalf(fc, "No source specified"); return invalf(fc, "No source specified");
bdev = blkdev_get_by_path(fc->source, mode, fc->fs_type, bdev = blkdev_get_by_path(fc->source, sb_open_mode(fc->sb_flags),
&fs_holder_ops); fc->fs_type, &fs_holder_ops);
if (IS_ERR(bdev)) { if (IS_ERR(bdev)) {
errorf(fc, "%s: Can't open blockdev", fc->source); errorf(fc, "%s: Can't open blockdev", fc->source);
return PTR_ERR(bdev); return PTR_ERR(bdev);
@ -1344,13 +1340,10 @@ struct dentry *mount_bdev(struct file_system_type *fs_type,
{ {
struct block_device *bdev; struct block_device *bdev;
struct super_block *s; struct super_block *s;
fmode_t mode = FMODE_READ;
int error = 0; int error = 0;
if (!(flags & SB_RDONLY)) bdev = blkdev_get_by_path(dev_name, sb_open_mode(flags), fs_type,
mode |= FMODE_WRITE; &fs_holder_ops);
bdev = blkdev_get_by_path(dev_name, mode, fs_type, &fs_holder_ops);
if (IS_ERR(bdev)) if (IS_ERR(bdev))
return ERR_CAST(bdev); return ERR_CAST(bdev);

7
include/linux/blkdev.h
View file

@ -1473,6 +1473,13 @@ struct blk_holder_ops {
void (*mark_dead)(struct block_device *bdev); void (*mark_dead)(struct block_device *bdev);
}; };
/*
* Return the correct open flags for blkdev_get_by_* for super block flags
* as stored in sb->s_flags.
*/
#define sb_open_mode(flags) \
(FMODE_READ | (((flags) & SB_RDONLY) ? 0 : FMODE_WRITE))
struct block_device *blkdev_get_by_dev(dev_t dev, fmode_t mode, void *holder, struct block_device *blkdev_get_by_dev(dev_t dev, fmode_t mode, void *holder,
const struct blk_holder_ops *hops); const struct blk_holder_ops *hops);
struct block_device *blkdev_get_by_path(const char *path, fmode_t mode, struct block_device *blkdev_get_by_path(const char *path, fmode_t mode,