Commit 79893c17 authored by Al Viro's avatar Al Viro
Browse files

fix prune_dcache()/umount() race



... and get rid of the last __put_super_and_need_restart() caller
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent df40c01a
...@@ -536,7 +536,7 @@ restart: ...@@ -536,7 +536,7 @@ restart:
*/ */
static void prune_dcache(int count) static void prune_dcache(int count)
{ {
struct super_block *sb; struct super_block *sb, *n;
int w_count; int w_count;
int unused = dentry_stat.nr_unused; int unused = dentry_stat.nr_unused;
int prune_ratio; int prune_ratio;
...@@ -545,13 +545,12 @@ static void prune_dcache(int count) ...@@ -545,13 +545,12 @@ static void prune_dcache(int count)
if (unused == 0 || count == 0) if (unused == 0 || count == 0)
return; return;
spin_lock(&dcache_lock); spin_lock(&dcache_lock);
restart:
if (count >= unused) if (count >= unused)
prune_ratio = 1; prune_ratio = 1;
else else
prune_ratio = unused / count; prune_ratio = unused / count;
spin_lock(&sb_lock); spin_lock(&sb_lock);
list_for_each_entry(sb, &super_blocks, s_list) { list_for_each_entry_safe(sb, n, &super_blocks, s_list) {
if (list_empty(&sb->s_instances)) if (list_empty(&sb->s_instances))
continue; continue;
if (sb->s_nr_dentry_unused == 0) if (sb->s_nr_dentry_unused == 0)
...@@ -592,14 +591,10 @@ restart: ...@@ -592,14 +591,10 @@ restart:
} }
spin_lock(&sb_lock); spin_lock(&sb_lock);
count -= pruned; count -= pruned;
/* __put_super(sb);
* restart only when sb is no longer on the list and /* more work left to do? */
* we have more work to do. if (count <= 0)
*/ break;
if (__put_super_and_need_restart(sb) && count > 0) {
spin_unlock(&sb_lock);
goto restart;
}
} }
spin_unlock(&sb_lock); spin_unlock(&sb_lock);
spin_unlock(&dcache_lock); spin_unlock(&dcache_lock);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment