diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-09-23 18:42:30 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-09-23 20:03:23 -0400 |
| commit | a053ebfb8c89e023a44c365e369f4053cfc53376 (patch) | |
| tree | c39f6a6689bbdeee358e824971d3e186ac4c3877 /linux | |
| parent | 731926b5e5fc28752433f830569d228513cceea6 (diff) | |
Update bcachefs sources to f9c612bbf82d bcachefs: Fixes for building in userspace
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/blkdev.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/linux/blkdev.c b/linux/blkdev.c index ea901a46..54af9f87 100644 --- a/linux/blkdev.c +++ b/linux/blkdev.c @@ -162,7 +162,7 @@ sector_t get_capacity(struct gendisk *disk) return bytes >> 9; } -void blkdev_put(struct block_device *bdev, fmode_t mode) +void blkdev_put(struct block_device *bdev, void *holder) { fdatasync(bdev->bd_fd); close(bdev->bd_sync_fd); @@ -170,25 +170,25 @@ void blkdev_put(struct block_device *bdev, fmode_t mode) free(bdev); } -struct block_device *blkdev_get_by_path(const char *path, fmode_t mode, - void *holder) +struct block_device *blkdev_get_by_path(const char *path, blk_mode_t mode, + void *holder, const struct blk_holder_ops *hop) { struct block_device *bdev; int fd, sync_fd, buffered_fd, flags = 0; - if ((mode & (FMODE_READ|FMODE_WRITE)) == (FMODE_READ|FMODE_WRITE)) + if ((mode & (BLK_OPEN_READ|BLK_OPEN_WRITE)) == (BLK_OPEN_READ|BLK_OPEN_WRITE)) flags = O_RDWR; - else if (mode & FMODE_READ) + else if (mode & BLK_OPEN_READ) flags = O_RDONLY; - else if (mode & FMODE_WRITE) + else if (mode & BLK_OPEN_WRITE) flags = O_WRONLY; - if (!(mode & FMODE_BUFFERED)) + if (!(mode & BLK_OPEN_BUFFERED)) flags |= O_DIRECT; #if 0 /* using O_EXCL doesn't work with opening twice for an O_SYNC fd: */ - if (mode & FMODE_EXCL) + if (mode & BLK_OPEN_EXCL) flags |= O_EXCL; #endif buffered_fd = open(path, flags & ~O_DIRECT); |