diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-06-21 02:55:13 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-06-21 03:28:19 -0400 |
| commit | faa974df646ce2a4b3b328ac91731524d107cc90 (patch) | |
| tree | 20822da3b0e1c31cb2d9279e94dafd0f7b99317d /fs/bcachefs/super-io.c | |
| parent | e86999fe02e3cb66a43de11ef24b77c1e3df1289 (diff) | |
bcachefs: fixups for 6.5bcachefs-for-upstream-merged-next
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/super-io.c')
| -rw-r--r-- | fs/bcachefs/super-io.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/bcachefs/super-io.c b/fs/bcachefs/super-io.c index 5a15d649d357..34889c157f0c 100644 --- a/fs/bcachefs/super-io.c +++ b/fs/bcachefs/super-io.c @@ -100,7 +100,7 @@ void bch2_free_super(struct bch_sb_handle *sb) { kfree(sb->bio); if (!IS_ERR_OR_NULL(sb->bdev)) - blkdev_put(sb->bdev, sb->mode); + blkdev_put(sb->bdev, sb); kfree(sb->sb); memset(sb, 0, sizeof(*sb)); @@ -595,22 +595,22 @@ int bch2_read_super(const char *path, struct bch_opts *opts, pr_verbose_init(*opts, ""); memset(sb, 0, sizeof(*sb)); - sb->mode = FMODE_READ; + sb->mode = BLK_OPEN_READ; sb->have_bio = true; if (!opt_get(*opts, noexcl)) - sb->mode |= FMODE_EXCL; + sb->mode |= BLK_OPEN_EXCL; if (!opt_get(*opts, nochanges)) - sb->mode |= FMODE_WRITE; + sb->mode |= BLK_OPEN_WRITE; - sb->bdev = blkdev_get_by_path(path, sb->mode, sb); + sb->bdev = blkdev_get_by_path(path, sb->mode, sb, NULL); if (IS_ERR(sb->bdev) && PTR_ERR(sb->bdev) == -EACCES && opt_get(*opts, read_only)) { sb->mode &= ~FMODE_WRITE; - sb->bdev = blkdev_get_by_path(path, sb->mode, sb); + sb->bdev = blkdev_get_by_path(path, sb->mode, sb, NULL); if (!IS_ERR(sb->bdev)) opt_set(*opts, nochanges, true); } |