From 1aea125e9aaab1fc05d9a3ae18f99dfc9f35c183 Mon Sep 17 00:00:00 2001 From: Dmitry Monakhov Date: Sat, 29 Sep 2012 00:56:15 -0400 Subject: [PATCH] --- yaml --- r: 331619 b: refs/heads/master c: 1b65007e9870e0021397b548e8cd6bbc584f9152 h: refs/heads/master i: 331617: d81755667596a2c36ac49b00e252adc00c389a0f 331615: 96a7865545194d650ae549ada261f1d8a9c46950 v: v3 --- [refs] | 2 +- trunk/fs/ext4/inode.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7e3a4400ae37..3316da3aa704 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c9114f9c0f10f58dd7e568a7152025af47b27e5 +refs/heads/master: 1b65007e9870e0021397b548e8cd6bbc584f9152 diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c index 0bfc63331467..05ab70dd5c64 100644 --- a/trunk/fs/ext4/inode.c +++ b/trunk/fs/ext4/inode.c @@ -4333,9 +4333,14 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr) if (attr->ia_valid & ATTR_SIZE) { if (attr->ia_size != i_size_read(inode)) { 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); }