From: Dmitry Monakhov <dmonakhov@openvz.org>
To: linux-ext4@vger.kernel.org
Cc: tytso@mit.edu, jack@suse.cz, wenqing.lz@taobao.com,
Dmitry Monakhov <dmonakhov@openvz.org>
Subject: [PATCH 6/7] ext4: endless truncate due to nonlocked dio readers V2
Date: Sun, 9 Sep 2012 21:27:13 +0400 [thread overview]
Message-ID: <1347211634-11509-7-git-send-email-dmonakhov@openvz.org> (raw)
In-Reply-To: <1347211634-11509-1-git-send-email-dmonakhov@openvz.org>
If we have enough aggressive DIO readers, truncate and other dio
waiters will wait forever inside inode_dio_wait(). It is reasonable
to disable nonlock DIO read optimization during truncate.
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
---
fs/ext4/extents.c | 2 +-
fs/ext4/fsync.c | 2 +-
fs/ext4/inode.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 8252651..b5b801f 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -4853,7 +4853,7 @@ int ext4_ext_punch_hole(struct file *file, loff_t offset, loff_t length)
}
/* finish any pending end_io work */
- inode_dio_wait(inode);
+ ext4_inode_dio_wait(inode, 1);
ext4_flush_completed_IO(inode);
credits = ext4_writepage_trans_blocks(inode);
diff --git a/fs/ext4/fsync.c b/fs/ext4/fsync.c
index 290c5cf..bdf6bfd 100644
--- a/fs/ext4/fsync.c
+++ b/fs/ext4/fsync.c
@@ -204,7 +204,7 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
if (inode->i_sb->s_flags & MS_RDONLY)
goto out;
- inode_dio_wait(inode);
+ ext4_inode_dio_wait(inode, 1);
ret = ext4_flush_completed_IO(inode);
if (ret < 0)
goto out;
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 93e6b09..a850026 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -4335,7 +4335,7 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr)
truncate_setsize(inode, attr->ia_size);
/* Inode size will be reduced, wait for dio in flight */
if (orphan)
- inode_dio_wait(inode);
+ ext4_inode_dio_wait(inode, 1);
}
ext4_truncate(inode);
}
--
1.7.7.6
next prev parent reply other threads:[~2012-09-09 17:27 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-09 17:27 [PATCH 0/7] ext4: Bunch of DIO/AIO fixes Dmitry Monakhov
2012-09-09 17:27 ` [PATCH 1/7] ext4: ext4_inode_info diet Dmitry Monakhov
2012-09-13 10:50 ` Zheng Liu
2012-09-13 11:15 ` Dmitry Monakhov
2012-09-15 15:53 ` Theodore Ts'o
2012-09-09 17:27 ` [PATCH 2/7] ext4: completed_io locking cleanup Dmitry Monakhov
2012-09-10 9:23 ` Jan Kara
2012-09-10 10:19 ` Dmitry Monakhov
2012-09-13 10:48 ` Zheng Liu
2012-09-09 17:27 ` [PATCH 3/7] ext4: serialize dio nolocked reads with defrag workers V2 Dmitry Monakhov
2012-09-10 9:31 ` Jan Kara
2012-09-10 10:00 ` Jan Kara
2012-09-09 17:27 ` [PATCH 4/7] ext4: fsync should wait for DIO writers Dmitry Monakhov
2012-09-10 9:51 ` Jan Kara
2012-09-10 10:56 ` Dmitry Monakhov
2012-09-12 14:02 ` Jan Kara
2012-09-12 5:40 ` Zheng Liu
2012-09-13 10:46 ` Zheng Liu
2012-09-13 11:01 ` Dmitry Monakhov
2012-09-13 12:36 ` Zheng Liu
2012-09-09 17:27 ` [PATCH 5/7] ext4: serialize unlocked dio reads with truncate Dmitry Monakhov
2012-09-10 9:54 ` Jan Kara
2012-09-09 17:27 ` Dmitry Monakhov [this message]
2012-09-13 10:41 ` [PATCH 6/7] ext4: endless truncate due to nonlocked dio readers V2 Zheng Liu
2012-09-13 12:07 ` Jan Kara
2012-09-13 12:57 ` Zheng Liu
2012-09-13 14:34 ` Jan Kara
2012-09-13 23:31 ` Zheng Liu
2012-09-09 17:27 ` [PATCH 7/7] ext4: serialize truncate with owerwrite DIO workers V2 Dmitry Monakhov
2012-09-13 10:37 ` Zheng Liu
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=1347211634-11509-7-git-send-email-dmonakhov@openvz.org \
--to=dmonakhov@openvz.org \
--cc=jack@suse.cz \
--cc=linux-ext4@vger.kernel.org \
--cc=tytso@mit.edu \
--cc=wenqing.lz@taobao.com \
/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).