summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2021-04-30 16:48:21 -0400
committerKent Overstreet <kent.overstreet@gmail.com>2021-04-30 18:23:38 -0400
commitbb74624daa138837d04c2a9931723115b9b6d645 (patch)
tree8c2c310f0d08fc731f573d21f20494a87a686300 /linux
parenta14d39d7ac45eebe45ed0772d1ed837f15b15af4 (diff)
Update bcachefs sources to a5c0e1bb30 bcachefs: Clean up bch2_btree_and_journal_walk()
Diffstat (limited to 'linux')
-rw-r--r--linux/blkdev.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/blkdev.c b/linux/blkdev.c
index 709e7703..270d3c89 100644
--- a/linux/blkdev.c
+++ b/linux/blkdev.c
@@ -215,6 +215,7 @@ struct block_device *blkdev_get_by_path(const char *path, fmode_t mode,
strncpy(bdev->name, path, sizeof(bdev->name));
bdev->name[sizeof(bdev->name) - 1] = '\0';
+ bdev->bd_dev = xfstat(fd).st_rdev;
bdev->bd_fd = fd;
bdev->bd_sync_fd = sync_fd;
bdev->bd_holder = holder;
@@ -230,9 +231,9 @@ void bdput(struct block_device *bdev)
BUG();
}
-struct block_device *lookup_bdev(const char *path)
+int lookup_bdev(const char *path, dev_t *dev)
{
- return ERR_PTR(-EINVAL);
+ return -EINVAL;
}
static int aio_completion_thread(void *arg)