From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f199.google.com (mail-pf0-f199.google.com [209.85.192.199]) by kanga.kvack.org (Postfix) with ESMTP id D5EAD6B0260 for ; Mon, 25 Sep 2017 19:14:31 -0400 (EDT) Received: by mail-pf0-f199.google.com with SMTP id a7so15458193pfj.3 for ; Mon, 25 Sep 2017 16:14:31 -0700 (PDT) Received: from mga07.intel.com (mga07.intel.com. [134.134.136.100]) by mx.google.com with ESMTPS id 142si4752383pgg.395.2017.09.25.16.14.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Sep 2017 16:14:30 -0700 (PDT) From: Ross Zwisler Subject: [PATCH 5/7] xfs: introduce xfs_is_dax_state_changing Date: Mon, 25 Sep 2017 17:14:02 -0600 Message-Id: <20170925231404.32723-6-ross.zwisler@linux.intel.com> In-Reply-To: <20170925231404.32723-1-ross.zwisler@linux.intel.com> References: <20170925231404.32723-1-ross.zwisler@linux.intel.com> Sender: owner-linux-mm@kvack.org List-ID: To: Andrew Morton , linux-kernel@vger.kernel.org Cc: Ross Zwisler , "Darrick J. Wong" , "J. Bruce Fields" , Christoph Hellwig , Dan Williams , Dave Chinner , Jan Kara , Jeff Layton , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-nvdimm@lists.01.org, linux-xfs@vger.kernel.org Pull this code out of xfs_ioctl_setattr_dax_invalidate() as it will be used in multiple places soon. Signed-off-by: Ross Zwisler --- fs/xfs/xfs_ioctl.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index 0433aef..386b437 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -1020,6 +1020,27 @@ xfs_diflags_to_linux( #endif } +static bool +xfs_is_dax_state_changing( + unsigned int xflags, + struct xfs_inode *ip) +{ + struct inode *inode = VFS_I(ip); + + /* + * If the DAX mount option was used we will update the DAX inode flag + * as the user requested but we will continue to use DAX for I/O and + * page faults regardless of how the inode flag is set. + */ + if (ip->i_mount->m_flags & XFS_MOUNT_DAX) + return false; + if ((xflags & FS_XFLAG_DAX) && IS_DAX(inode)) + return false; + if (!(xflags & FS_XFLAG_DAX) && !IS_DAX(inode)) + return false; + return true; +} + static int xfs_ioctl_setattr_xflags( struct xfs_trans *tp, @@ -1105,17 +1126,8 @@ xfs_ioctl_setattr_dax_invalidate( return -EINVAL; } - /* - * If the DAX state is not changing, we have nothing to do here. If - * the DAX mount option was used we will update the DAX inode flag as - * the user requested but we will continue to use DAX for I/O and page - * faults regardless of how the inode flag is set. - */ - if (ip->i_mount->m_flags & XFS_MOUNT_DAX) - return 0; - if ((fa->fsx_xflags & FS_XFLAG_DAX) && IS_DAX(inode)) - return 0; - if (!(fa->fsx_xflags & FS_XFLAG_DAX) && !IS_DAX(inode)) + /* If the DAX state is not changing, we have nothing to do here. */ + if (!xfs_is_dax_state_changing(fa->fsx_xflags, ip)) return 0; /* lock, flush and invalidate mapping in preparation for flag change */ -- 2.9.5 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org