Fix longstanding lock inversion in drop_pagecache_sb by dropping inode_lock
before calling __invalidate_mapping_pages(). We just have to make sure
inode won't go away from under us by keeping reference to it and putting
the reference only after we have safely resumed the scan of the inode
list. A bit tricky but not too bad...
Signed-off-by: Jan Kara <jack@suse.cz>
CC: Fengguang Wu <wfg@mail.ustc.edu.cn>
CC: David Chinner <dgc@sgi.com>
---
fs/drop_caches.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/fs/drop_caches.c b/fs/drop_caches.c
index 59375ef..f5aae26 100644
--- a/fs/drop_caches.c
+++ b/fs/drop_caches.c
@@ -14,15 +14,21 @@ int sysctl_drop_caches;
static void drop_pagecache_sb(struct super_block *sb)
{
- struct inode *inode;
+ struct inode *inode, *toput_inode = NULL;
spin_lock(&inode_lock);
list_for_each_entry(inode, &sb->s_inodes, i_sb_list) {
if (inode->i_state & (I_FREEING|I_WILL_FREE))
continue;
+ __iget(inode);
+ spin_unlock(&inode_lock);
__invalidate_mapping_pages(inode->i_mapping, 0, -1, true);
+ iput(toput_inode);
+ toput_inode = inode;
+ spin_lock(&inode_lock);
}
spin_unlock(&inode_lock);
+ iput(toput_inode);
}
void drop_pagecache(void)
--
1.5.2.4
--
| Greg Kroah-Hartman | [PATCH 004/196] Chinese: add translation of SubmittingPatches |
| Andi Kleen | Re: [patch] Add basic sanity checks to the syscall execution patch |
| Bart Van Assche | Integration of SCST in the mainstream Linux kernel |
| Stoyan Gaydarov | From 2.4 to 2.6 to 2.7? |
git: | |
| Elijah Newren | Trying to use git-filter-branch to compress history by removing large, obsolete bi... |
| Matthieu Moy | git push to a non-bare repository |
| Johannes Schindelin | Re: Git as a filesystem |
| Jakub Narebski | Re: VCS comparison table |
| Richard Stallman | Real men don't attack straw men |
| Joachim Schipper | Re: OpenBSD/alpha Status |
| Theo de Raadt | Re: hardware needed for network stack performance work |
| Marcus Andree | Re: Cyrus IMAP performance problems [Long] |
| Andrew Morton | Re: [Bugme-new] [Bug 10473] New: Infinite loop "b44: eth0: powering down PHY" |
| John Rigby | [PATCH] [Rev2] MPC5121 FEC support |
| Pekka Enberg | Re: [rfc][patch 1/3] slub: fix small HWCACHE_ALIGN alignment |
| Ilpo Järvinen | [PATCH] [TCP]: Separate lost_retrans loop into own function |
