diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-21 23:02:56 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-21 23:02:56 +0300 |
| commit | 3413efa8885d7a714c54c6752eaf49fd17d351c9 (patch) | |
| tree | 8737b11827379324405593e91c60101e6ae7f7ca /block/early-lookup.c | |
| parent | 2a8120d7b4827380f30b57788ff92ec5594e2194 (diff) | |
| parent | 811ba89a8838e7c43ff46b6210ba1878bfe4437e (diff) | |
| download | linux-3413efa8885d7a714c54c6752eaf49fd17d351c9.tar.xz | |
Merge tag 'pull-bd_flags-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull bdev flags update from Al Viro:
"Compactifying bdev flags.
We can easily have up to 24 flags with sane atomicity, _without_
pushing anything out of the first cacheline of struct block_device"
* tag 'pull-bd_flags-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
bdev: move ->bd_make_it_fail to ->__bd_flags
bdev: move ->bd_ro_warned to ->__bd_flags
bdev: move ->bd_has_subit_bio to ->__bd_flags
bdev: move ->bd_write_holder into ->__bd_flags
bdev: move ->bd_read_only to ->__bd_flags
bdev: infrastructure for flags
wrapper for access to ->bd_partno
Use bdev_is_paritition() instead of open-coding it
Diffstat (limited to 'block/early-lookup.c')
| -rw-r--r-- | block/early-lookup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/early-lookup.c b/block/early-lookup.c index 3effbd0d35e9..3fb57f7d2b12 100644 --- a/block/early-lookup.c +++ b/block/early-lookup.c @@ -78,7 +78,7 @@ static int __init devt_from_partuuid(const char *uuid_str, dev_t *devt) * to the partition number found by UUID. */ *devt = part_devt(dev_to_disk(dev), - dev_to_bdev(dev)->bd_partno + offset); + bdev_partno(dev_to_bdev(dev)) + offset); } else { *devt = dev->devt; } |