mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-30 11:04:25 +00:00
fs/block_dev.c: skip rw_page if bdev has integrity
If a block device has bio integrity enabled, rw_page will bypass the integrity payload, which is undesirable. Skip rw_page if this is the case. Currently brd and zram provide rw_page, and the proposed 'nd' drivers will too. Cc: Jens Axboe <axboe@fb.com> Cc: Martin K. Petersen <martin.petersen@oracle.com> Suggested-by: Matthew Wilcox <matthew.r.wilcox@intel.com> Signed-off-by: Vishal Verma <vishal.l.verma@linux.intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
parent
bc30196f71
commit
f68eb1e71a
1 changed files with 2 additions and 2 deletions
|
@ -376,7 +376,7 @@ int bdev_read_page(struct block_device *bdev, sector_t sector,
|
||||||
struct page *page)
|
struct page *page)
|
||||||
{
|
{
|
||||||
const struct block_device_operations *ops = bdev->bd_disk->fops;
|
const struct block_device_operations *ops = bdev->bd_disk->fops;
|
||||||
if (!ops->rw_page)
|
if (!ops->rw_page || bdev_get_integrity(bdev))
|
||||||
return -EOPNOTSUPP;
|
return -EOPNOTSUPP;
|
||||||
return ops->rw_page(bdev, sector + get_start_sect(bdev), page, READ);
|
return ops->rw_page(bdev, sector + get_start_sect(bdev), page, READ);
|
||||||
}
|
}
|
||||||
|
@ -407,7 +407,7 @@ int bdev_write_page(struct block_device *bdev, sector_t sector,
|
||||||
int result;
|
int result;
|
||||||
int rw = (wbc->sync_mode == WB_SYNC_ALL) ? WRITE_SYNC : WRITE;
|
int rw = (wbc->sync_mode == WB_SYNC_ALL) ? WRITE_SYNC : WRITE;
|
||||||
const struct block_device_operations *ops = bdev->bd_disk->fops;
|
const struct block_device_operations *ops = bdev->bd_disk->fops;
|
||||||
if (!ops->rw_page)
|
if (!ops->rw_page || bdev_get_integrity(bdev))
|
||||||
return -EOPNOTSUPP;
|
return -EOPNOTSUPP;
|
||||||
set_page_writeback(page);
|
set_page_writeback(page);
|
||||||
result = ops->rw_page(bdev, sector + get_start_sect(bdev), page, rw);
|
result = ops->rw_page(bdev, sector + get_start_sect(bdev), page, rw);
|
||||||
|
|
Loading…
Add table
Reference in a new issue