52 lines
1.4 KiB
Diff
52 lines
1.4 KiB
Diff
|
From: lduncan@suse.com
|
||
|
|
Date: Thu 25 Jan 2024 12:40:46 PM PST
|
||
|
|
Subject: [PATCH] Oracleasm: handle FMODE_EXCL removal
|
||
|
|
Patch-mainline: never (Oracle KMP specific)
|
||
|
|
References: bsc#1215781
|
||
|
|
|
||
|
|
Just remove use of FMODE_EXCL, for now.
|
||
|
|
|
||
|
|
Signed-off-by: Lee Duncan <lduncan@suse.com>
|
||
|
|
---
|
||
|
|
drivers/block/oracleasm/driver.c | 8 ++++----
|
||
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/block/oracleasm/driver.c
|
||
|
|
+++ b/drivers/block/oracleasm/driver.c
|
||
|
|
@@ -315,7 +315,7 @@ static void asmdisk_evict_inode(struct i
|
||
|
|
BUG_ON(d->d_live);
|
||
|
|
|
||
|
|
if (d->d_bdev) {
|
||
|
|
- blkdev_put(d->d_bdev, FMODE_WRITE | FMODE_READ | FMODE_EXCL);
|
||
|
|
+ blkdev_put(d->d_bdev, FMODE_WRITE | FMODE_READ);
|
||
|
|
d->d_bdev = NULL;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
@@ -698,7 +698,7 @@ static int asm_open_disk(struct file *fi
|
||
|
|
struct asmdisk_find_inode_args args;
|
||
|
|
|
||
|
|
if (IS_ERR(blkdev_get_by_dev(bdev->bd_dev,
|
||
|
|
- FMODE_WRITE | FMODE_READ | FMODE_EXCL, inode->i_sb,
|
||
|
|
+ FMODE_WRITE | FMODE_READ, inode->i_sb,
|
||
|
|
NULL))) {
|
||
|
|
ret = -EBUSY;
|
||
|
|
goto out;
|
||
|
|
@@ -740,7 +740,7 @@ static int asm_open_disk(struct file *fi
|
||
|
|
trace_disk(d, "open");
|
||
|
|
} else {
|
||
|
|
/* Already claimed on first open */
|
||
|
|
- blkdev_put(bdev, FMODE_WRITE | FMODE_READ | FMODE_EXCL);
|
||
|
|
+ blkdev_put(bdev, FMODE_WRITE | FMODE_READ);
|
||
|
|
trace_disk(d, "reopen");
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -761,7 +761,7 @@ out_head:
|
||
|
|
kfree(h);
|
||
|
|
|
||
|
|
out_get:
|
||
|
|
- blkdev_put(bdev, FMODE_WRITE | FMODE_READ | FMODE_EXCL);
|
||
|
|
+ blkdev_put(bdev, FMODE_WRITE | FMODE_READ);
|
||
|
|
|
||
|
|
out:
|
||
|
|
return ret;
|