27 lines
855 B
Diff
27 lines
855 B
Diff
|
From: Lee Duncan <lduncan@suse.com>
|
||
|
|
Date: Wed 15 Sep 2021 01:52:06 PM PDT
|
||
|
|
Subject: [PATCH] oracleasm: convert blkdev_get() to blkdev_get_by_dev()
|
||
|
|
|
||
|
|
Upstream blkdev_get() has been removed and replaced by
|
||
|
|
calls to blkdev_get_by_dev() or blkdev_get_by_path().
|
||
|
|
|
||
|
|
---
|
||
|
|
drivers/block/oracleasm/driver.c | 5 +++--
|
||
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/block/oracleasm/driver.c
|
||
|
|
+++ b/drivers/block/oracleasm/driver.c
|
||
|
|
@@ -714,9 +714,10 @@ static int asm_open_disk(struct file *fi
|
||
|
|
struct inode *disk_inode;
|
||
|
|
struct asmdisk_find_inode_args args;
|
||
|
|
|
||
|
|
- ret = blkdev_get(bdev, FMODE_WRITE | FMODE_READ | FMODE_EXCL, inode->i_sb);
|
||
|
|
- if (ret)
|
||
|
|
+ if (IS_ERR(blkdev_get_by_dev(bdev->bd_dev, FMODE_WRITE | FMODE_READ | FMODE_EXCL, inode->i_sb))) {
|
||
|
|
+ ret = -EBUSY;
|
||
|
|
goto out;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
ret = set_blocksize(bdev, asm_block_size(bdev));
|
||
|
|
if (ret)
|