From patchwork Wed Dec 21 01:37:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 9482437 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9A134601C0 for ; Wed, 21 Dec 2016 01:42:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 81981281AA for ; Wed, 21 Dec 2016 01:42:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 707E728174; Wed, 21 Dec 2016 01:42:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BE7D228174 for ; Wed, 21 Dec 2016 01:42:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933598AbcLUBlv (ORCPT ); Tue, 20 Dec 2016 20:41:51 -0500 Received: from mga02.intel.com ([134.134.136.20]:38110 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932763AbcLUBlv (ORCPT ); Tue, 20 Dec 2016 20:41:51 -0500 Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga101.jf.intel.com with ESMTP; 20 Dec 2016 17:41:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,381,1477983600"; d="scan'208";a="44849208" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.14]) by orsmga005.jf.intel.com with ESMTP; 20 Dec 2016 17:41:48 -0800 Subject: [PATCH] dax: kill uml support From: Dan Williams To: akpm@linux-foundation.org Cc: Jan Kara , Matthew Wilcox , Dave Chinner , linux-kernel@vger.kernel.org, Dave Hansen , Alexander Viro , linux-fsdevel@vger.kernel.org, Ross Zwisler , Christoph Hellwig Date: Tue, 20 Dec 2016 17:37:40 -0800 Message-ID: <148228426023.2477.2662330241414304847.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.17.1-9-g687f MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The lack of common transparent-huge-page helpers for UML is becoming increasingly painful for fs/dax.c now that it is growing more pmd functionality. Add UML to the list of unsupported architectures, and clean up no-longer-necessary ifdef as a result. Cc: Jan Kara Cc: Christoph Hellwig Cc: Dave Chinner Cc: Dave Hansen Cc: Matthew Wilcox Cc: Alexander Viro Cc: Ross Zwisler Signed-off-by: Dan Williams Reviewed-by: Ross Zwisler --- fs/Kconfig | 2 +- fs/dax.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/Kconfig b/fs/Kconfig index c2a377cdda2b..661931fb0ce0 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -37,7 +37,7 @@ source "fs/f2fs/Kconfig" config FS_DAX bool "Direct Access (DAX) support" depends on MMU - depends on !(ARM || MIPS || SPARC) + depends on !(ARM || MIPS || SPARC || UML) help Direct Access (DAX) can be used on memory-backed block devices. If the block device supports DAX and the filesystem supports DAX, diff --git a/fs/dax.c b/fs/dax.c index ddcddfeaa03b..86df835783ea 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -710,8 +710,7 @@ static void dax_mapping_entry_mkclean(struct address_space *mapping, if (follow_pte_pmd(vma->vm_mm, address, &ptep, &pmdp, &ptl)) continue; - if (pmdp) { -#ifdef CONFIG_FS_DAX_PMD + if (pmdp && IS_ENABLED(CONFIG_FS_DAX_PMD)) { pmd_t pmd; if (pfn != pmd_pfn(*pmdp)) @@ -727,7 +726,6 @@ static void dax_mapping_entry_mkclean(struct address_space *mapping, changed = true; unlock_pmd: spin_unlock(ptl); -#endif } else { if (pfn != pte_pfn(*ptep)) goto unlock_pte;