From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de ([195.135.220.15]:40745 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750878AbcLUIxu (ORCPT ); Wed, 21 Dec 2016 03:53:50 -0500 Date: Wed, 21 Dec 2016 09:53:47 +0100 From: Jan Kara To: Dan Williams Cc: akpm@linux-foundation.org, Jan Kara , Matthew Wilcox , Dave Chinner , linux-kernel@vger.kernel.org, Dave Hansen , Alexander Viro , linux-fsdevel@vger.kernel.org, Ross Zwisler , Christoph Hellwig Subject: Re: [PATCH] dax: kill uml support Message-ID: <20161221085347.GB4756@quack2.suse.cz> References: <148228426023.2477.2662330241414304847.stgit@dwillia2-desk3.amr.corp.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <148228426023.2477.2662330241414304847.stgit@dwillia2-desk3.amr.corp.intel.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: On Tue 20-12-16 17:37:40, Dan Williams wrote: > 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. ... > 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; So I was under the impression that pmdp can never be != NULL when CONFIG_FS_DAX_PMD is disabled. Otherwise Ross' patch would leave ptl locked in that case... Did I miss something or we can just remove IS_ENABLED() check? Honza -- Jan Kara SUSE Labs, CR