From: ira.weiny@intel.com
To: linux-kernel@vger.kernel.org, linux-xfs@vger.kernel.org,
"Darrick J. Wong" <darrick.wong@oracle.com>
Cc: Ira Weiny <ira.weiny@intel.com>, Jan Kara <jack@suse.cz>,
Christoph Hellwig <hch@lst.de>, Al Viro <viro@zeniv.linux.org.uk>,
Dan Williams <dan.j.williams@intel.com>,
Dave Chinner <david@fromorbit.com>,
"Theodore Y. Ts'o" <tytso@mit.edu>,
Jeff Moyer <jmoyer@redhat.com>,
linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-api@vger.kernel.org
Subject: [PATCH V10 02/11] fs: Remove unneeded IS_DAX() check in io_is_direct()
Date: Wed, 22 Apr 2020 14:20:53 -0700 [thread overview]
Message-ID: <20200422212102.3757660-3-ira.weiny@intel.com> (raw)
In-Reply-To: <20200422212102.3757660-1-ira.weiny@intel.com>
From: Ira Weiny <ira.weiny@intel.com>
Remove the check because DAX now has it's own read/write methods and
file systems which support DAX check IS_DAX() prior to IOCB_DIRECT on
their own. Therefore, it does not matter if the file state is DAX when
the iocb flags are created.
Also remove io_is_direct() as it is just a simple flag check.
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
Changes from v8:
Rebase to latest Linus tree
Changes from v6:
remove io_is_direct() as well.
Remove Reviews since this is quite a bit different.
Changes from v3:
Reword commit message.
Reordered to be a 'pre-cleanup' patch
---
drivers/block/loop.c | 6 +++---
include/linux/fs.h | 7 +------
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index da693e6a834e..14372df0f354 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -634,8 +634,8 @@ static int do_req_filebacked(struct loop_device *lo, struct request *rq)
static inline void loop_update_dio(struct loop_device *lo)
{
- __loop_update_dio(lo, io_is_direct(lo->lo_backing_file) |
- lo->use_dio);
+ __loop_update_dio(lo, (lo->lo_backing_file->f_flags & O_DIRECT) |
+ lo->use_dio);
}
static void loop_reread_partitions(struct loop_device *lo,
@@ -1028,7 +1028,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
if (!(lo_flags & LO_FLAGS_READ_ONLY) && file->f_op->fsync)
blk_queue_write_cache(lo->lo_queue, true, false);
- if (io_is_direct(lo->lo_backing_file) && inode->i_sb->s_bdev) {
+ if ((lo->lo_backing_file->f_flags & O_DIRECT) && inode->i_sb->s_bdev) {
/* In case of direct I/O, match underlying block size */
unsigned short bsize = bdev_logical_block_size(
inode->i_sb->s_bdev);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 4f6f59b4f22a..a87cc5845a02 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -3394,11 +3394,6 @@ extern void setattr_copy(struct inode *inode, const struct iattr *attr);
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);
-}
-
static inline bool vma_is_dax(const struct vm_area_struct *vma)
{
return vma->vm_file && IS_DAX(vma->vm_file->f_mapping->host);
@@ -3423,7 +3418,7 @@ static inline int iocb_flags(struct file *file)
int res = 0;
if (file->f_flags & O_APPEND)
res |= IOCB_APPEND;
- if (io_is_direct(file))
+ if (file->f_flags & O_DIRECT)
res |= IOCB_DIRECT;
if ((file->f_flags & O_DSYNC) || IS_SYNC(file->f_mapping->host))
res |= IOCB_DSYNC;
--
2.25.1
next prev parent reply other threads:[~2020-04-22 21:22 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-22 21:20 [PATCH V10 00/11] XFS - Enable per-file/per-directory DAX operations V10 ira.weiny
2020-04-22 21:20 ` [PATCH V10 01/11] fs/xfs: Remove unnecessary initialization of i_rwsem ira.weiny
2020-04-22 21:20 ` ira.weiny [this message]
2020-04-23 21:41 ` [PATCH V10 02/11] fs: Remove unneeded IS_DAX() check in io_is_direct() Dave Chinner
2020-04-22 21:20 ` [PATCH V10 03/11] fs/stat: Define DAX statx attribute ira.weiny
2020-04-22 21:20 ` [PATCH V10 04/11] Documentation/dax: Update Usage section ira.weiny
2020-04-23 2:33 ` Yasunori Goto
2020-04-23 5:05 ` Ira Weiny
2020-04-23 22:27 ` Dave Chinner
2020-04-23 23:25 ` Ira Weiny
2020-04-24 2:15 ` Dave Chinner
2020-04-24 5:55 ` Ira Weiny
2020-04-22 21:20 ` [PATCH V10 05/11] fs/xfs: Change XFS_MOUNT_DAX to XFS_MOUNT_DAX_ALWAYS ira.weiny
2020-04-23 22:27 ` Dave Chinner
2020-04-22 21:20 ` [PATCH V10 06/11] fs/xfs: Make DAX mount option a tri-state ira.weiny
2020-04-23 22:35 ` Dave Chinner
2020-04-23 23:33 ` Ira Weiny
2020-04-22 21:20 ` [PATCH V10 07/11] fs/xfs: Create function xfs_inode_should_enable_dax() ira.weiny
2020-04-23 22:36 ` Dave Chinner
2020-04-22 21:20 ` [PATCH V10 08/11] fs/xfs: Combine xfs_diflags_to_linux() and xfs_diflags_to_iflags() ira.weiny
2020-04-23 22:37 ` Dave Chinner
2020-04-22 21:21 ` [PATCH V10 09/11] fs: Lift XFS_IDONTCACHE to the VFS layer ira.weiny
2020-04-23 22:38 ` Dave Chinner
2020-04-22 21:21 ` [PATCH V10 10/11] fs: Introduce DCACHE_DONTCACHE ira.weiny
2020-04-23 8:40 ` Jan Kara
2020-04-23 22:57 ` Dave Chinner
2020-04-23 23:38 ` Ira Weiny
2020-04-22 21:21 ` [PATCH V10 11/11] fs/xfs: Update xfs_ioctl_setattr_dax_invalidate() ira.weiny
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=20200422212102.3757660-3-ira.weiny@intel.com \
--to=ira.weiny@intel.com \
--cc=dan.j.williams@intel.com \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=hch@lst.de \
--cc=jack@suse.cz \
--cc=jmoyer@redhat.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
/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).