Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752510AbdG1RAb (ORCPT ); Fri, 28 Jul 2017 13:00:31 -0400 Received: from mga03.intel.com ([134.134.136.65]:60503 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752027AbdG1RAa (ORCPT ); Fri, 28 Jul 2017 13:00:30 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,425,1496127600"; d="scan'208";a="1200309084" From: Ross Zwisler To: Andrew Morton , linux-kernel@vger.kernel.org Cc: Ross Zwisler , "karam . lee" , Minchan Kim , Jerome Marchand , Nitin Gupta , seungho1.park@lge.com, Matthew Wilcox , Christoph Hellwig , Dan Williams , Dave Chinner , Jan Kara , Jens Axboe , Vishal Verma , linux-nvdimm@lists.01.org Subject: [PATCH 2/3] pmem: remove pmem_rw_page() Date: Fri, 28 Jul 2017 10:56:03 -0600 Message-Id: <20170728165604.10455-3-ross.zwisler@linux.intel.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170728165604.10455-1-ross.zwisler@linux.intel.com> References: <20170728165604.10455-1-ross.zwisler@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1743 Lines: 52 The rw_page() interface doesn't provide a clear performance benefit for PMEM and has had a nonzero maintenance burden, so remove it. Signed-off-by: Ross Zwisler Suggested-by: Dan Williams Suggested-by: Christoph Hellwig Cc: Matthew Wilcox --- drivers/nvdimm/pmem.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index f7099ada..f23c82d 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -182,26 +182,6 @@ static blk_qc_t pmem_make_request(struct request_queue *q, struct bio *bio) return BLK_QC_T_NONE; } -static int pmem_rw_page(struct block_device *bdev, sector_t sector, - struct page *page, bool is_write) -{ - struct pmem_device *pmem = bdev->bd_queue->queuedata; - blk_status_t rc; - - rc = pmem_do_bvec(pmem, page, PAGE_SIZE, 0, is_write, sector); - - /* - * The ->rw_page interface is subtle and tricky. The core - * retries on any error, so we can only invoke page_endio() in - * the successful completion case. Otherwise, we'll see crashes - * caused by double completion. - */ - if (rc == 0) - page_endio(page, is_write, 0); - - return blk_status_to_errno(rc); -} - /* see "strong" declaration in tools/testing/nvdimm/pmem-dax.c */ __weak long __pmem_direct_access(struct pmem_device *pmem, pgoff_t pgoff, long nr_pages, void **kaddr, pfn_t *pfn) @@ -225,7 +205,6 @@ __weak long __pmem_direct_access(struct pmem_device *pmem, pgoff_t pgoff, static const struct block_device_operations pmem_fops = { .owner = THIS_MODULE, - .rw_page = pmem_rw_page, .revalidate_disk = nvdimm_revalidate_disk, }; -- 2.9.4