diff options
Diffstat (limited to 'c_src')
| -rw-r--r-- | c_src/cmd_migrate.c | 6 | ||||
| -rw-r--r-- | c_src/libbcachefs.h | 2 | ||||
| -rw-r--r-- | c_src/tools-util.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/c_src/cmd_migrate.c b/c_src/cmd_migrate.c index e26b3bb8..5ac326dd 100644 --- a/c_src/cmd_migrate.c +++ b/c_src/cmd_migrate.c @@ -676,12 +676,12 @@ static int migrate_fs(const char *fs_path, struct dev_opts dev = dev_opts_default(); dev.path = dev_t_to_path(stat.st_dev); - dev.handle = bdev_open_by_path(dev.path, BLK_OPEN_READ|BLK_OPEN_WRITE, &dev, NULL); + dev.file = bdev_file_open_by_path(dev.path, BLK_OPEN_READ|BLK_OPEN_WRITE, &dev, NULL); - int ret = PTR_ERR_OR_ZERO(dev.handle); + int ret = PTR_ERR_OR_ZERO(dev.file); if (ret < 0) die("Error opening device to format %s: %s", dev.path, strerror(-ret)); - dev.bdev = dev.handle->bdev; + dev.bdev = file_bdev(dev.file); opt_set(fs_opts, block_size, get_blocksize(dev.bdev->bd_fd)); diff --git a/c_src/libbcachefs.h b/c_src/libbcachefs.h index 739783f0..05720573 100644 --- a/c_src/libbcachefs.h +++ b/c_src/libbcachefs.h @@ -52,7 +52,7 @@ static inline struct format_opts format_opts_default() } struct dev_opts { - struct bdev_handle *handle; + struct file *file; struct block_device *bdev; char *path; u64 size; /* bytes*/ diff --git a/c_src/tools-util.c b/c_src/tools-util.c index d8371c24..7da1d689 100644 --- a/c_src/tools-util.c +++ b/c_src/tools-util.c @@ -189,13 +189,13 @@ int open_for_format(struct dev_opts *dev, bool force) const char *fs_type = NULL, *fs_label = NULL; size_t fs_type_len, fs_label_len; - dev->handle = bdev_open_by_path(dev->path, + dev->file = bdev_file_open_by_path(dev->path, BLK_OPEN_READ|BLK_OPEN_WRITE|BLK_OPEN_EXCL|BLK_OPEN_BUFFERED, dev, NULL); - int ret = PTR_ERR_OR_ZERO(dev->handle); + int ret = PTR_ERR_OR_ZERO(dev->file); if (ret < 0) die("Error opening device to format %s: %s", dev->path, strerror(-ret)); - dev->bdev = dev->handle->bdev; + dev->bdev = file_bdev(dev->file); if (!(pr = blkid_new_probe())) die("blkid error 1"); |