Received: by 2002:a25:ef43:0:0:0:0:0 with SMTP id w3csp496894ybm; Thu, 28 May 2020 08:03:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwbiyhYIIDZdsDR5Cm/rNRIVAfcQ+3Oj56zPwP8hoLXZccHrQTaH8btzqLwuw1pEkXZh1DQ X-Received: by 2002:a17:906:7c4e:: with SMTP id g14mr3542115ejp.353.1590678222812; Thu, 28 May 2020 08:03:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590678222; cv=none; d=google.com; s=arc-20160816; b=k9ZIXRk2tqP3H+e/pkqpAP33+RxtnUWNz0WA+eOoSoNRf1mIxn35yukpa6tJje/rDt V5CjU/8KCoZCJlwsMA8E4g6aPqSxTZvh5PLCkeRpFAGXHIgCq0T0ctGEAsyQbDmR0PAu HXU891YMr09jM2sxqXcyL8uDV2rcHdC0pJLhHUvW87Dq5TvfuCcAzcZf/OO7B1amCi2A J4XTiZExhMJ0/wt7GBSFyELJUTq1xn4hAZA3DD9dgTYT+zzG/YlXrnSdAb5htJC9i8Tw RhMsAIfyH0lQ1fj8h/7b8VHt6tzK3yowplyAo6NfsUVyam2n8k2leAHxYtcMVOi7dxMs i2Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=BX80IEAtoBoFrX/lxpIGpDDngiYojxfvDfvoNRkpRfc=; b=XfFD1q8knBU7uK/imuqeHxLBywscnXCHI8YSufPo0KxILN6tHYWw/RI0rL1aRPY9bI MY/Y/D2/aGDeMlaFgrcndtBAsP3W42N46LPASiJ4Hh4nMT4LB2YCNgNqejr97QMQQKu2 wagjObblK6h35aAX5qrFOIGr5ZKrBqat7SQ3APvhjT6mN9gyGHg3z8eRNCZfx2MZ1j7H GYSwWPdr+fnZpSX7z7lNrPHs2pF1qo62TLBTxlj7+5tULVXFlnSQ3CnxFovUzZ8w3UJT KJk+38KAv8+cbjUmWoiok6f72n3lGmTYkLF9DDiy6E9cOhwrmAZqKJOYuVA1cs2HuPHJ q9WA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ai4si3998721ejc.704.2020.05.28.08.03.15; Thu, 28 May 2020 08:03:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404081AbgE1PAl (ORCPT + 99 others); Thu, 28 May 2020 11:00:41 -0400 Received: from mga14.intel.com ([192.55.52.115]:1158 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404071AbgE1PAi (ORCPT ); Thu, 28 May 2020 11:00:38 -0400 IronPort-SDR: Y8uViMIethO0MkCEhvR9VOaQo4rCdZoPZZ16WvrbxaOWarbL+YXwAXtwlHt9kIvhqGctihczQk 1FBmHsC2QDeA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 May 2020 08:00:07 -0700 IronPort-SDR: 6N8dWPAxPrX53sMbbv5wZaIXtDwBwCLk1QRpyPK+kZDPuERC+bTR72rxhkzT99XkN5JxmD/M61 07sOm4tAgWOg== X-IronPort-AV: E=Sophos;i="5.73,445,1583222400"; d="scan'208";a="267242300" Received: from iweiny-desk2.sc.intel.com (HELO localhost) ([10.3.52.147]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 May 2020 08:00:06 -0700 From: ira.weiny@intel.com To: linux-ext4@vger.kernel.org, Andreas Dilger , "Theodore Y. Ts'o" , Jan Kara , Eric Biggers Cc: Ira Weiny , Al Viro , Dan Williams , Dave Chinner , Christoph Hellwig , Jeff Moyer , "Darrick J. Wong" , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V5 1/9] fs/ext4: Narrow scope of DAX check in setflags Date: Thu, 28 May 2020 07:59:55 -0700 Message-Id: <20200528150003.828793-2-ira.weiny@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200528150003.828793-1-ira.weiny@intel.com> References: <20200528150003.828793-1-ira.weiny@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ira Weiny When preventing DAX and journaling on an inode. Use the effective DAX check rather than the mount option. This will be required to support per inode DAX flags. Reviewed-by: Jan Kara Signed-off-by: Ira Weiny --- fs/ext4/ioctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index 0746532ba463..f23168387deb 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c @@ -393,9 +393,9 @@ static int ext4_ioctl_setflags(struct inode *inode, if ((jflag ^ oldflags) & (EXT4_JOURNAL_DATA_FL)) { /* * Changes to the journaling mode can cause unsafe changes to - * S_DAX if we are using the DAX mount option. + * S_DAX if the inode is DAX */ - if (test_opt(inode->i_sb, DAX)) { + if (IS_DAX(inode)) { err = -EBUSY; goto flags_out; } -- 2.25.1