diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
| commit | 414f746d232d41ed6ae8632c4495ae795373c44b (patch) | |
| tree | 167f9bc8f139c6e82e6732b38c7a938b8a9d31cd /fs/dcache.c | |
| parent | 5a7a201c51c324876d00a54e7208af6af12d1ca4 (diff) | |
| parent | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'fs/dcache.c')
| -rw-r--r-- | fs/dcache.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index 3818d6ab76ca..f2584d22cb45 100644 --- a/fs/dcache.c +++ b/fs/dcache.c | |||
| @@ -487,6 +487,7 @@ restart: | |||
| 487 | if (!cnt) | 487 | if (!cnt) |
| 488 | break; | 488 | break; |
| 489 | } | 489 | } |
| 490 | cond_resched_lock(&dcache_lock); | ||
| 490 | } | 491 | } |
| 491 | } | 492 | } |
| 492 | while (!list_empty(&tmp)) { | 493 | while (!list_empty(&tmp)) { |