| Message ID | 1348847051-6746-9-git-send-email-dmonakhov@openvz.org |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Fri 28-09-12 19:44:08, Dmitry Monakhov wrote: > 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. OK, as per our previous discussion I agree. So you can add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > > Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org> > --- > fs/ext4/inode.c | 9 +++++++-- > 1 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c > index 583cb3f..c40a98d 100644 > --- a/fs/ext4/inode.c > +++ b/fs/ext4/inode.c > @@ -4305,9 +4305,14 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr) > if (attr->ia_valid & ATTR_SIZE) { > if (attr->ia_size != inode->i_size) { > truncate_setsize(inode, attr->ia_size); > - /* Inode size will be reduced, wait for dio in flight */ > - if (orphan) > + /* Inode size will be reduced, wait for dio in flight. > + * Temporarily disable dioread_nolock to prevent > + * livelock. */ > + if (orphan) { > + ext4_inode_block_unlocked_dio(inode); > inode_dio_wait(inode); > + ext4_inode_resume_unlocked_dio(inode); > + } > } > ext4_truncate(inode); > } > -- > 1.7.7.6 > -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 583cb3f..c40a98d 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -4305,9 +4305,14 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr) if (attr->ia_valid & ATTR_SIZE) { if (attr->ia_size != inode->i_size) { truncate_setsize(inode, attr->ia_size); - /* Inode size will be reduced, wait for dio in flight */ - if (orphan) + /* Inode size will be reduced, wait for dio in flight. + * Temporarily disable dioread_nolock to prevent + * livelock. */ + if (orphan) { + ext4_inode_block_unlocked_dio(inode); inode_dio_wait(inode); + ext4_inode_resume_unlocked_dio(inode); + } } ext4_truncate(inode); }
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/inode.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)