MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-07 18:05:21 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "fs: Convert to bdev_open_by_dev()"

Browse Source 
This reverts commit 4365d0d660 which is
commit f4a48bc36c upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I36bf7e4279a05eb0028ea4da17a2cb735de04bdc
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2024-08-30 08:11:30 +00:00
parent a8167db0c5
commit 01ed5e66a4
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/cramfs/inode.c
View File

@ -495,7 +495,7 @@ static void cramfs_kill_sb(struct super_block *sb)
sb->s_mtd = NULL; sb->s_mtd = NULL;
} else if (IS_ENABLED(CONFIG_CRAMFS_BLOCKDEV) && sb->s_bdev) { } else if (IS_ENABLED(CONFIG_CRAMFS_BLOCKDEV) && sb->s_bdev) {
sync_blockdev(sb->s_bdev); sync_blockdev(sb->s_bdev);
bdev_release(sb->s_bdev_handle); blkdev_put(sb->s_bdev, sb);
} }
kfree(sbi); kfree(sbi);
} }

2
fs/romfs/super.c
View File

@ -593,7 +593,7 @@ static void romfs_kill_sb(struct super_block *sb)
#ifdef CONFIG_ROMFS_ON_BLOCK #ifdef CONFIG_ROMFS_ON_BLOCK
if (sb->s_bdev) { if (sb->s_bdev) {
sync_blockdev(sb->s_bdev); sync_blockdev(sb->s_bdev);
bdev_release(sb->s_bdev_handle); blkdev_put(sb->s_bdev, sb);
} }
#endif #endif
} }

15
fs/super.c
View File

@ -1493,16 +1493,14 @@ int setup_bdev_super(struct super_block *sb, int sb_flags,
struct fs_context *fc) struct fs_context *fc)
{ {
blk_mode_t mode = sb_open_mode(sb_flags); blk_mode_t mode = sb_open_mode(sb_flags);
struct bdev_handle *bdev_handle;
struct block_device *bdev; struct block_device *bdev;
bdev_handle = bdev_open_by_dev(sb->s_dev, mode, sb, &fs_holder_ops); bdev = blkdev_get_by_dev(sb->s_dev, mode, sb, &fs_holder_ops);
if (IS_ERR(bdev_handle)) { if (IS_ERR(bdev)) {
if (fc) if (fc)
errorf(fc, "%s: Can't open blockdev", fc->source); errorf(fc, "%s: Can't open blockdev", fc->source);
return PTR_ERR(bdev_handle); return PTR_ERR(bdev);
} }
bdev = bdev_handle->bdev;
/* /*
* This really should be in blkdev_get_by_dev, but right now can't due * This really should be in blkdev_get_by_dev, but right now can't due
@ -1510,7 +1508,7 @@ int setup_bdev_super(struct super_block *sb, int sb_flags,
* writable from userspace even for a read-only block device. * writable from userspace even for a read-only block device.
*/ */
if ((mode & BLK_OPEN_WRITE) && bdev_read_only(bdev)) { if ((mode & BLK_OPEN_WRITE) && bdev_read_only(bdev)) {
bdev_release(bdev_handle); blkdev_put(bdev, sb);
return -EACCES; return -EACCES;
} }
@ -1526,11 +1524,10 @@ int setup_bdev_super(struct super_block *sb, int sb_flags,
mutex_unlock(&bdev->bd_fsfreeze_mutex); mutex_unlock(&bdev->bd_fsfreeze_mutex);
if (fc) if (fc)
warnf(fc, "%pg: Can't mount, blockdev is frozen", bdev); warnf(fc, "%pg: Can't mount, blockdev is frozen", bdev);
bdev_release(bdev_handle); blkdev_put(bdev, sb);
return -EBUSY; return -EBUSY;
} }
spin_lock(&sb_lock); spin_lock(&sb_lock);
sb->s_bdev_handle = bdev_handle;
sb->s_bdev = bdev; sb->s_bdev = bdev;
sb->s_bdi = bdi_get(bdev->bd_disk->bdi); sb->s_bdi = bdi_get(bdev->bd_disk->bdi);
if (bdev_stable_writes(bdev)) if (bdev_stable_writes(bdev))
@ -1663,7 +1660,7 @@ void kill_block_super(struct super_block *sb)
generic_shutdown_super(sb); generic_shutdown_super(sb);
if (bdev) { if (bdev) {
sync_blockdev(bdev); sync_blockdev(bdev);
bdev_release(sb->s_bdev_handle); blkdev_put(bdev, sb);
} }
} }

1
include/linux/fs.h
View File

@ -1214,7 +1214,6 @@ struct super_block {
struct hlist_bl_head s_roots; /* alternate root dentries for NFS */ struct hlist_bl_head s_roots; /* alternate root dentries for NFS */
struct list_head s_mounts; /* list of mounts; _not_ for fs use */ struct list_head s_mounts; /* list of mounts; _not_ for fs use */
struct block_device *s_bdev; struct block_device *s_bdev;
struct bdev_handle *s_bdev_handle;
struct backing_dev_info *s_bdi; struct backing_dev_info *s_bdi;
struct mtd_info *s_mtd; struct mtd_info *s_mtd;
struct hlist_node s_instances; struct hlist_node s_instances;