[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20150617235524.12943.51967.stgit@dwillia2-desk3.amr.corp.intel.com>
Date: Wed, 17 Jun 2015 19:55:24 -0400
From: Dan Williams <dan.j.williams@...el.com>
To: axboe@...nel.dk, linux-nvdimm@...ts.01.org
Cc: boaz@...xistor.com, toshi.kani@...com,
"Martin K. Petersen" <martin.petersen@...cle.com>,
Vishal Verma <vishal.l.verma@...ux.intel.com>,
linux-kernel@...r.kernel.org, mingo@...nel.org,
Jens Axboe <axboe@...com>, linux-acpi@...r.kernel.org,
Matthew Wilcox <matthew.r.wilcox@...el.com>,
linux-fsdevel@...r.kernel.org, hch@....de
Subject: [PATCH 07/15] fs/block_dev.c: skip rw_page if bdev has integrity
From: Vishal Verma <vishal.l.verma@...ux.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@...com>
Cc: Martin K. Petersen <martin.petersen@...cle.com>
Suggested-by: Matthew Wilcox <matthew.r.wilcox@...el.com>
Signed-off-by: Vishal Verma <vishal.l.verma@...ux.intel.com>
Signed-off-by: Dan Williams <dan.j.williams@...el.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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists