projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[linux-2.6-block.git]
/
fs
/
drop_caches.c
diff --git
a/fs/drop_caches.c
b/fs/drop_caches.c
index 4e4762389bdc560d993dfb42b3db9b664396e77f..3e5637fc377962e1aaca5665f3e03d89366673e3 100644
(file)
--- a/
fs/drop_caches.c
+++ b/
fs/drop_caches.c
@@
-14,18
+14,26
@@
int sysctl_drop_caches;
static void drop_pagecache_sb(struct super_block *sb)
{
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;
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;
- invalidate_inode_pages(inode->i_mapping);
+ if (inode->i_mapping->nrpages == 0)
+ 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);
}
spin_unlock(&inode_lock);
+ iput(toput_inode);
}
}
-void drop_pagecache(void)
+
static
void drop_pagecache(void)
{
struct super_block *sb;
{
struct super_block *sb;
@@
-45,7
+53,7
@@
restart:
spin_unlock(&sb_lock);
}
spin_unlock(&sb_lock);
}
-void drop_slab(void)
+
static
void drop_slab(void)
{
int nr_objects;
{
int nr_objects;