From: Jan Kara <jack@suse.cz>
To: Dan Williams <dan.j.williams@intel.com>
Cc: linux-nvdimm@lists.01.org,
Matthew Wilcox <mawilcox@microsoft.com>,
linux-kernel@vger.kernel.org, stable@vger.kernel.org,
linux-mm@kvack.org, Jan Kara <jack@suse.com>,
linux-fsdevel@vger.kernel.org,
Ross Zwisler <ross.zwisler@linux.intel.com>
Subject: Re: [PATCH v4 10/12] fs, dax: kill IS_DAX()
Date: Tue, 27 Feb 2018 18:06:29 +0100 [thread overview]
Message-ID: <20180227170629.t54gjterrprylp3w@quack2.suse.cz> (raw)
In-Reply-To: <151970524837.26729.14336810163194275690.stgit@dwillia2-desk3.amr.corp.intel.com>
On Mon 26-02-18 20:20:48, Dan Williams wrote:
> In preparation for fixing the broken definition of S_DAX in the
> CONFIG_FS_DAX=n + CONFIG_DEV_DAX=y case, convert all the remaining
> IS_DAX() usages to use explicit tests for FSDAX.
>
> Cc: Jan Kara <jack@suse.com>
> Cc: Matthew Wilcox <mawilcox@microsoft.com>
> Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
> Cc: <stable@vger.kernel.org>
> Fixes: dee410792419 ("/dev/dax, core: file operations and dax-mmap")
> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Looks good. You can add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
> ---
> fs/iomap.c | 2 +-
> include/linux/dax.h | 2 +-
> include/linux/fs.h | 3 +--
> 3 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/fs/iomap.c b/fs/iomap.c
> index afd163586aa0..fe379d8949fd 100644
> --- a/fs/iomap.c
> +++ b/fs/iomap.c
> @@ -377,7 +377,7 @@ iomap_zero_range_actor(struct inode *inode, loff_t pos, loff_t count,
> offset = pos & (PAGE_SIZE - 1); /* Within page */
> bytes = min_t(loff_t, PAGE_SIZE - offset, count);
>
> - if (IS_DAX(inode))
> + if (IS_FSDAX(inode))
> status = iomap_dax_zero(pos, offset, bytes, iomap);
> else
> status = iomap_zero(inode, pos, offset, bytes, iomap);
> diff --git a/include/linux/dax.h b/include/linux/dax.h
> index 47edbce4fc52..ce520e932adc 100644
> --- a/include/linux/dax.h
> +++ b/include/linux/dax.h
> @@ -124,7 +124,7 @@ static inline ssize_t dax_iomap_rw(struct kiocb *iocb, struct iov_iter *iter,
>
> static inline bool dax_mapping(struct address_space *mapping)
> {
> - return mapping->host && IS_DAX(mapping->host);
> + return mapping->host && IS_FSDAX(mapping->host);
> }
>
> struct writeback_control;
> diff --git a/include/linux/fs.h b/include/linux/fs.h
> index 4a5aa8761011..8021f10068d3 100644
> --- a/include/linux/fs.h
> +++ b/include/linux/fs.h
> @@ -1903,7 +1903,6 @@ static inline bool sb_rdonly(const struct super_block *sb) { return sb->s_flags
> #define IS_IMA(inode) ((inode)->i_flags & S_IMA)
> #define IS_AUTOMOUNT(inode) ((inode)->i_flags & S_AUTOMOUNT)
> #define IS_NOSEC(inode) ((inode)->i_flags & S_NOSEC)
> -#define IS_DAX(inode) ((inode)->i_flags & S_DAX)
> #define IS_ENCRYPTED(inode) ((inode)->i_flags & S_ENCRYPTED)
>
> #define IS_WHITEOUT(inode) (S_ISCHR(inode->i_mode) && \
> @@ -3203,7 +3202,7 @@ extern int file_update_time(struct file *file);
>
> static inline bool io_is_direct(struct file *filp)
> {
> - return (filp->f_flags & O_DIRECT) || IS_DAX(filp->f_mapping->host);
> + return (filp->f_flags & O_DIRECT) || IS_FSDAX(filp->f_mapping->host);
> }
>
> static inline bool vma_is_dax(struct vm_area_struct *vma)
>
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
next prev parent reply other threads:[~2018-02-27 17:06 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-27 4:19 [PATCH v4 00/12] vfio, dax: prevent long term filesystem-dax pins and other fixes Dan Williams
2018-02-27 4:20 ` [PATCH v4 01/12] dax: fix vma_is_fsdax() helper Dan Williams
2018-02-27 4:20 ` [PATCH v4 02/12] dax: introduce IS_DEVDAX() and IS_FSDAX() Dan Williams
2018-02-27 16:54 ` Jan Kara
2018-02-27 4:20 ` [PATCH v4 03/12] ext2, dax: finish implementing dax_sem helpers Dan Williams
2018-02-27 17:00 ` Jan Kara
2018-02-27 4:20 ` [PATCH v4 04/12] ext2, dax: define ext2_dax_*() infrastructure in all cases Dan Williams
2018-02-27 17:01 ` Jan Kara
2018-02-27 4:20 ` [PATCH v4 05/12] ext4, dax: define ext4_dax_*() " Dan Williams
2018-02-27 17:01 ` Jan Kara
2018-02-27 4:20 ` [PATCH v4 06/12] ext2, dax: replace IS_DAX() with IS_FSDAX() Dan Williams
2018-02-27 17:02 ` Jan Kara
2018-02-27 4:20 ` [PATCH v4 07/12] ext4, " Dan Williams
2018-02-27 17:02 ` Jan Kara
2018-02-27 4:20 ` [PATCH v4 08/12] xfs, " Dan Williams
2018-02-27 17:03 ` Jan Kara
2018-02-27 4:20 ` [PATCH v4 09/12] mm, dax: replace IS_DAX() with IS_DEVDAX() or IS_FSDAX() Dan Williams
2018-02-27 17:05 ` Jan Kara
2018-02-27 4:20 ` [PATCH v4 10/12] fs, dax: kill IS_DAX() Dan Williams
2018-02-27 17:06 ` Jan Kara [this message]
2018-02-27 4:20 ` [PATCH v4 11/12] dax: fix S_DAX definition Dan Williams
2018-02-27 4:20 ` [PATCH v4 12/12] vfio: disable filesystem-dax page pinning Dan Williams
2018-02-27 22:23 ` [PATCH v4 00/12] vfio, dax: prevent long term filesystem-dax pins and other fixes Dave Chinner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180227170629.t54gjterrprylp3w@quack2.suse.cz \
--to=jack@suse.cz \
--cc=dan.j.williams@intel.com \
--cc=jack@suse.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-nvdimm@lists.01.org \
--cc=mawilcox@microsoft.com \
--cc=ross.zwisler@linux.intel.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).