From patchwork Thu Dec 3 21:58:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wilcox, Matthew R" X-Patchwork-Id: 7763841 Return-Path: X-Original-To: patchwork-linux-nvdimm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A792BBEEE1 for ; Thu, 3 Dec 2015 21:58:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EA4B5205ED for ; Thu, 3 Dec 2015 21:58:51 +0000 (UTC) Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2C770205E7 for ; Thu, 3 Dec 2015 21:58:51 +0000 (UTC) Received: from ml01.vlan14.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id BB4C01A203D; Thu, 3 Dec 2015 13:58:50 -0800 (PST) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ml01.01.org (Postfix) with ESMTP id 9E3351A2039 for ; Thu, 3 Dec 2015 13:58:48 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP; 03 Dec 2015 13:58:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,378,1444719600"; d="scan'208";a="866185210" Received: from rfarhi-mobl4.amr.corp.intel.com (HELO thog.int.wil.cx) ([10.252.198.26]) by fmsmga002.fm.intel.com with SMTP; 03 Dec 2015 13:58:47 -0800 Received: by thog.int.wil.cx (Postfix, from userid 1000) id 1C5955F7A3; Thu, 3 Dec 2015 16:58:46 -0500 (EST) From: Matthew Wilcox To: Dan Williams Subject: [PATCH 1/2] dax: Fix read() of a hole Date: Thu, 3 Dec 2015 16:58:41 -0500 Message-Id: <1449179922-502-2-git-send-email-matthew.r.wilcox@intel.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1449179922-502-1-git-send-email-matthew.r.wilcox@intel.com> References: <1449179922-502-1-git-send-email-matthew.r.wilcox@intel.com> Cc: linux-nvdimm@lists.01.org X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Matthew Wilcox The dax->addr is set to an errno in order to indicate that there is no current mapping (and therefore we don't need to call blk_queue_exit()). When we read() from a hole, we were unconditionally incrementing dax->addr, until it no longer represented an eror value. Check that dax->addr is not an errno before incrementing it. Signed-off-by: Matthew Wilcox --- fs/dax.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/dax.c b/fs/dax.c index 6662de3..727af65 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -207,7 +207,8 @@ static ssize_t dax_io(struct inode *inode, struct iov_iter *iter, } pos += len; - dax.addr += len; + if (!IS_ERR(dax.addr)) + dax.addr += len; } if (need_wmb)