xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Tükrözés 0
Kód Hibajegyek Egyesítési kérések Actions Packages Projektek Kiadások Wiki Tevékenység

dm: remove fmode_t argument from .prepare_ioctl hook

Forráskód böngészése 
Use the fmode_t that is passed to dm_blk_ioctl() rather than
inconsistently (varies across targets) drop it on the floor by
overriding it with the fmode_t stored in 'struct dm_dev'.

All the persistent reservation functions weren't using the fmode_t they
got back from .prepare_ioctl so remove them.

Signed-off-by: Mike Snitzer <snitzer@redhat.com>
This commit is contained in:
Mike Snitzer
2018-04-03 16:54:10 -04:00
szülő 971888c469
commit 5bd5e8d891
9 fájl változott, egészen pontosan 15 új sor hozzáadva és 27 régi sor törölve
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/md/dm.c
Fájl megtekintése

@@ -459,7 +459,7 @@ static int dm_blk_getgeo(struct block_device *bdev, struct hd_geometry *geo)
}
static int dm_prepare_ioctl(struct mapped_device *md, int *srcu_idx,
struct block_device **bdev, fmode_t *mode)
struct block_device **bdev)
__acquires(md->io_barrier)
{
struct dm_target *tgt;
@@ -483,7 +483,7 @@ retry:
if (dm_suspended_md(md))
return -EAGAIN;
r = tgt->type->prepare_ioctl(tgt, bdev, mode);
r = tgt->type->prepare_ioctl(tgt, bdev);
if (r == -ENOTCONN && !fatal_signal_pending(current)) {
dm_put_live_table(md, *srcu_idx);
msleep(10);
@@ -505,7 +505,7 @@ static int dm_blk_ioctl(struct block_device *bdev, fmode_t mode,
struct mapped_device *md = bdev->bd_disk->private_data;
int r, srcu_idx;
r = dm_prepare_ioctl(md, &srcu_idx, &bdev, &mode);
r = dm_prepare_ioctl(md, &srcu_idx, &bdev);
if (r < 0)
goto out;
@@ -3034,10 +3034,9 @@ static int dm_pr_reserve(struct block_device *bdev, u64 key, enum pr_type type,
{
struct mapped_device *md = bdev->bd_disk->private_data;
const struct pr_ops *ops;
fmode_t mode;
int r, srcu_idx;
r = dm_prepare_ioctl(md, &srcu_idx, &bdev, &mode);
r = dm_prepare_ioctl(md, &srcu_idx, &bdev);
if (r < 0)
goto out;
@@ -3055,10 +3054,9 @@ static int dm_pr_release(struct block_device *bdev, u64 key, enum pr_type type)
{
struct mapped_device *md = bdev->bd_disk->private_data;
const struct pr_ops *ops;
fmode_t mode;
int r, srcu_idx;
r = dm_prepare_ioctl(md, &srcu_idx, &bdev, &mode);
r = dm_prepare_ioctl(md, &srcu_idx, &bdev);
if (r < 0)
goto out;
@@ -3077,10 +3075,9 @@ static int dm_pr_preempt(struct block_device *bdev, u64 old_key, u64 new_key,
{
struct mapped_device *md = bdev->bd_disk->private_data;
const struct pr_ops *ops;
fmode_t mode;
int r, srcu_idx;
r = dm_prepare_ioctl(md, &srcu_idx, &bdev, &mode);
r = dm_prepare_ioctl(md, &srcu_idx, &bdev);
if (r < 0)
goto out;
@@ -3098,10 +3095,9 @@ static int dm_pr_clear(struct block_device *bdev, u64 key)
{
struct mapped_device *md = bdev->bd_disk->private_data;
const struct pr_ops *ops;
fmode_t mode;
int r, srcu_idx;
r = dm_prepare_ioctl(md, &srcu_idx, &bdev, &mode);
r = dm_prepare_ioctl(md, &srcu_idx, &bdev);
if (r < 0)
goto out;