From patchwork Fri Jan 1 03:58:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 7938401 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 F170CBEEE5 for ; Fri, 1 Jan 2016 03:58:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1980C2050B for ; Fri, 1 Jan 2016 03:58:58 +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 40B4D20501 for ; Fri, 1 Jan 2016 03:58:57 +0000 (UTC) Received: from ml01.vlan14.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 1ABD81A245A; Thu, 31 Dec 2015 19:58:57 -0800 (PST) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by ml01.01.org (Postfix) with ESMTP id 65A891A245A for ; Thu, 31 Dec 2015 19:58:55 -0800 (PST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP; 31 Dec 2015 19:58:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,506,1444719600"; d="scan'208";a="718424206" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.136]) by orsmga003.jf.intel.com with ESMTP; 31 Dec 2015 19:58:55 -0800 Subject: [-mm PATCH] dax: fix dax_pmd_dbg build warning From: Dan Williams To: akpm@linux-foundation.org Date: Thu, 31 Dec 2015 19:58:28 -0800 Message-ID: <20160101035828.29910.59955.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.17.1-9-g687f MIME-Version: 1.0 Cc: linux-mm@kvack.org, 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: , 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, 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 Fixes below warning from commit 3cb108f941deb "dax-add-support-for-fsync-sync-v6" in -next. fs/dax.c: In function ‘__dax_pmd_fault’: fs/dax.c:916:15: warning: passing argument 1 of ‘__dax_dbg’ from incompatible pointer type dax_pmd_dbg(bdev, address, ^ fs/dax.c:738:13: note: expected ‘struct buffer_head *’ but argument is of type ‘struct block_device *’ static void __dax_dbg(struct buffer_head *bh, unsigned long address, Cc: Ross Zwisler Signed-off-by: Dan Williams --- fs/dax.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/dax.c b/fs/dax.c index 4ff61b412383..41cf4ee0b859 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -913,7 +913,7 @@ int __dax_pmd_fault(struct vm_area_struct *vma, unsigned long address, error = dax_radix_entry(mapping, pgoff, dax.sector, true, true); if (error) { - dax_pmd_dbg(bdev, address, + dax_pmd_dbg(&bh, address, "PMD radix insertion failed"); goto fallback; }