[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <151970520551.26729.12707678649514382892.stgit@dwillia2-desk3.amr.corp.intel.com>
Date: Mon, 26 Feb 2018 20:20:05 -0800
From: Dan Williams <dan.j.williams@...el.com>
To: linux-nvdimm@...ts.01.org
Cc: Theodore Ts'o <tytso@....edu>,
"Darrick J. Wong" <darrick.wong@...cle.com>,
Matthew Wilcox <mawilcox@...rosoft.com>,
linux-kernel@...r.kernel.org, stable@...r.kernel.org,
"supporter:XFS FILESYSTEM" <linux-xfs@...r.kernel.org>,
linux-mm@...ck.org, Andreas Dilger <adilger.kernel@...ger.ca>,
Alexander Viro <viro@...iv.linux.org.uk>,
linux-fsdevel@...r.kernel.org, Jan Kara <jack@...e.cz>,
Ross Zwisler <ross.zwisler@...ux.intel.com>
Subject: [PATCH v4 02/12] dax: introduce IS_DEVDAX() and IS_FSDAX()
The current IS_DAX() helper that checks the S_DAX inode flag is
ambiguous, and currently has the broken assumption that the S_DAX flag
is only non-zero in the CONFIG_FS_DAX=y case. In preparation for
defining S_DAX to non-zero in the CONFIG_FS_DAX=n + CONFIG_DEV_DAX=y
case, introduce two explicit helpers to replace IS_DAX().
Cc: "Theodore Ts'o" <tytso@....edu>
Cc: Andreas Dilger <adilger.kernel@...ger.ca>
Cc: Alexander Viro <viro@...iv.linux.org.uk>
Cc: "Darrick J. Wong" <darrick.wong@...cle.com>
Cc: linux-xfs@...r.kernel.org (supporter:XFS FILESYSTEM)
Cc: Matthew Wilcox <mawilcox@...rosoft.com>
Cc: Ross Zwisler <ross.zwisler@...ux.intel.com>
Cc: <stable@...r.kernel.org>
Fixes: dee410792419 ("/dev/dax, core: file operations and dax-mmap")
Reported-by: Jan Kara <jack@...e.cz>
Signed-off-by: Dan Williams <dan.j.williams@...el.com>
---
include/linux/fs.h | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 79c413985305..bd0c46880572 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1909,6 +1909,28 @@ static inline bool sb_rdonly(const struct super_block *sb) { return sb->s_flags
#define IS_WHITEOUT(inode) (S_ISCHR(inode->i_mode) && \
(inode)->i_rdev == WHITEOUT_DEV)
+static inline bool IS_DEVDAX(struct inode *inode)
+{
+ if (!IS_ENABLED(CONFIG_DEV_DAX))
+ return false;
+ if ((inode->i_flags & S_DAX) == 0)
+ return false;
+ if (!S_ISCHR(inode->i_mode))
+ return false;
+ return true;
+}
+
+static inline bool IS_FSDAX(struct inode *inode)
+{
+ if (!IS_ENABLED(CONFIG_FS_DAX))
+ return false;
+ if ((inode->i_flags & S_DAX) == 0)
+ return false;
+ if (S_ISCHR(inode->i_mode))
+ return false;
+ return true;
+}
+
static inline bool HAS_UNMAPPED_ID(struct inode *inode)
{
return !uid_valid(inode->i_uid) || !gid_valid(inode->i_gid);
Powered by blists - more mailing lists