Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751651AbbEGX3a (ORCPT ); Thu, 7 May 2015 19:29:30 -0400 Received: from mga09.intel.com ([134.134.136.24]:21251 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751158AbbEGX32 (ORCPT ); Thu, 7 May 2015 19:29:28 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,386,1427785200"; d="scan'208";a="706981407" From: Vishal Verma To: Jens Axboe Cc: Vishal Verma , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Dan Williams , Matthew Wilcox , "Martin K. Petersen" Subject: [PATCH] fs/block_dev.c: skip rw_page if bdev has integrity Date: Thu, 7 May 2015 17:28:30 -0600 Message-Id: <1431041310-30281-1-git-send-email-vishal.l.verma@linux.intel.com> X-Mailer: git-send-email 2.1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1718 Lines: 49 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. Signed-off-by: Vishal Verma Suggested-by: Matthew Wilcox Cc: Jens Axboe Cc: Martin K. Petersen Acked-by: Dan Williams --- Applies to v4.1-rc2 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 c7e4163..054ef1b 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); -- 2.1.0 -- 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/