diff options
| author | Eric Anholt <eric@anholt.net> | 2010-05-08 01:30:03 +0400 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-05-11 00:36:52 +0400 |
| commit | 34dc4d4423dc342848d72be764832cbc0852854a (patch) | |
| tree | 056402a4afc2b7ef2f4dee30a712ce847279c13a /fs/logfs/gc.c | |
| parent | 3d8620cc5f8538364ee152811e2bd8713abb1d58 (diff) | |
| parent | 722154e4cacf015161efe60009ae9be23d492296 (diff) | |
| download | linux-34dc4d4423dc342848d72be764832cbc0852854a.tar.xz | |
Merge remote branch 'origin/master' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/radeon/r300.c
The BSD ringbuffer support that is landing in this branch
significantly conflicts with the Ironlake PIPE_CONTROL fix on master,
and requires it to be tested successfully anyway.
Diffstat (limited to 'fs/logfs/gc.c')
| -rw-r--r-- | fs/logfs/gc.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/logfs/gc.c b/fs/logfs/gc.c index 84e36f52fe95..76c242fbe1b0 100644 --- a/fs/logfs/gc.c +++ b/fs/logfs/gc.c @@ -459,6 +459,14 @@ static void __logfs_gc_pass(struct super_block *sb, int target) struct logfs_block *block; int round, progress, last_progress = 0; + /* + * Doing too many changes to the segfile at once would result + * in a large number of aliases. Write the journal before + * things get out of hand. + */ + if (super->s_shadow_tree.no_shadowed_segments >= MAX_OBJ_ALIASES) + logfs_write_anchor(sb); + if (no_free_segments(sb) >= target && super->s_no_object_aliases < MAX_OBJ_ALIASES) return; |