Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1167494

[PATCH 07/15] fs/block_dev.c: skip rw_page if bdev has integrity

Show key headers only | View raw

From: Vishal Verma <vishal.l.verma@linux.intel.com>

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>
---
 fs/block_dev.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/block_dev.c b/fs/block_dev.c
index c7e4163ede87..054ef1bbb821 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -376,7 +376,7 @@ int bdev_read_page(struct block_device *bdev, sector_t sector,
 			struct page *page)
 {
 	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 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 rw = (wbc->sync_mode == WB_SYNC_ALL) ? WRITE_SYNC : WRITE;
 	const struct block_device_operations *ops = bdev->bd_disk->fops;
-	if (!ops->rw_page)
+	if (!ops->rw_page || bdev_get_integrity(bdev))
 		return -EOPNOTSUPP;
 	set_page_writeback(page);
 	result = ops->rw_page(bdev, sector + get_start_sect(bdev), page, rw);

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/15] libnvdimm: ->rw_bytes(), BLK-mode, unit tests,  and misc features Dan Williams <dan.j.williams@intel.com> - 2015-06-18 02:00 +0200
  [PATCH 12/15] libnvdimm: enable iostat Dan Williams <dan.j.williams@intel.com> - 2015-06-18 02:00 +0200
    Re: [PATCH 12/15] libnvdimm: enable iostat Christoph Hellwig <hch@lst.de> - 2015-06-19 10:40 +0200
      Re: [PATCH 12/15] libnvdimm: enable iostat Dan Williams <dan.j.williams@intel.com> - 2015-06-19 11:10 +0200
        Re: [PATCH 12/15] libnvdimm: enable iostat Christoph Hellwig <hch@lst.de> - 2015-06-21 12:20 +0200
  [PATCH 07/15] fs/block_dev.c: skip rw_page if bdev has integrity Dan Williams <dan.j.williams@intel.com> - 2015-06-18 02:00 +0200
  [PATCH 13/15] libnvdimm: flag libnvdimm block devices as  non-rotational Dan Williams <dan.j.williams@intel.com> - 2015-06-18 02:00 +0200
  [PATCH 01/15] block: introduce an ->rw_bytes() block device  operation Dan Williams <dan.j.williams@intel.com> - 2015-06-18 02:00 +0200
    Re: [PATCH 01/15] block: introduce an ->rw_bytes() block device operation Dan Williams <dan.j.williams@intel.com> - 2015-06-18 21:30 +0200
  [PATCH 09/15] libnvdimm, blk: add support for blk integrity Dan Williams <dan.j.williams@intel.com> - 2015-06-18 02:00 +0200
  [PATCH 15/15] libnvdimm, nfit: handle acpi_nfit_memory_map flags Dan Williams <dan.j.williams@intel.com> - 2015-06-18 02:00 +0200
  [PATCH 11/15] libnvdimm: pmem, blk, and btt make_request cleanups Dan Williams <dan.j.williams@intel.com> - 2015-06-18 02:10 +0200
    Re: [PATCH 11/15] libnvdimm: pmem, blk, and btt make_request  cleanups Christoph Hellwig <hch@lst.de> - 2015-06-21 12:20 +0200
  [PATCH 08/15] libnvdimm, btt: add support for blk integrity Dan Williams <dan.j.williams@intel.com> - 2015-06-18 02:10 +0200
  [PATCH 02/15] libnvdimm: infrastructure for btt devices Dan Williams <dan.j.williams@intel.com> - 2015-06-18 02:10 +0200
  [PATCH 10/15] libnvdimm: fix up max_hw_sectors Dan Williams <dan.j.williams@intel.com> - 2015-06-18 02:10 +0200
    Re: [PATCH 10/15] libnvdimm: fix up max_hw_sectors Christoph Hellwig <hch@lst.de> - 2015-06-21 12:10 +0200
  Re: [PATCH 03/15] nd_btt: atomic sector updates Christoph Hellwig <hch@lst.de> - 2015-06-21 12:10 +0200
    Re: [PATCH 03/15] nd_btt: atomic sector updates Dan Williams <dan.j.williams@intel.com> - 2015-06-21 18:40 +0200
  Re: [PATCH 04/15] libnvdimm, nfit, nd_blk: driver for BLK-mode  access persistent memory Christoph Hellwig <hch@lst.de> - 2015-06-21 12:10 +0200
    Re: [PATCH 04/15] libnvdimm, nfit, nd_blk: driver for BLK-mode access  persistent memory Dan Williams <dan.j.williams@intel.com> - 2015-06-21 16:50 +0200

csiph-web