diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-09 22:52:12 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-09 22:52:12 +0400 |
| commit | b975dee3811ae0c58bd0e19cbd041cac8dd37ec5 (patch) | |
| tree | d65f5381024a00982e47fd6144d219bb6b34ff78 /fs/ubifs/gc.c | |
| parent | deac93df26b20cf8438339b5935b5f5643bc30c9 (diff) | |
| parent | a5cb562d6977d9d7989c346b7b153cef31ec0228 (diff) | |
| download | linux-b975dee3811ae0c58bd0e19cbd041cac8dd37ec5.tar.xz | |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubifs-2.6
* 'linux-next' of git://git.infradead.org/~dedekind/ubifs-2.6:
UBIFS: make minimum fanout 3
UBIFS: fix division by zero
UBIFS: amend f_fsid
UBIFS: fill f_fsid
UBIFS: improve statfs reporting even more
UBIFS: introduce LEB overhead
UBIFS: add forgotten gc_idx_lebs component
UBIFS: fix assertion
UBIFS: improve statfs reporting
UBIFS: remove incorrect index space check
UBIFS: push empty flash hack down
UBIFS: do not update min_idx_lebs in stafs
UBIFS: allow for racing between GC and TNC
UBIFS: always read hashed-key nodes under TNC mutex
UBIFS: fix zero-length truncations
Diffstat (limited to 'fs/ubifs/gc.c')
| -rw-r--r-- | fs/ubifs/gc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/ubifs/gc.c b/fs/ubifs/gc.c index d0f3dac29081..13f1019c859f 100644 --- a/fs/ubifs/gc.c +++ b/fs/ubifs/gc.c @@ -344,6 +344,12 @@ int ubifs_garbage_collect_leb(struct ubifs_info *c, struct ubifs_lprops *lp) if (err) goto out; + /* Allow for races with TNC */ + c->gced_lnum = lnum; + smp_wmb(); + c->gc_seq += 1; + smp_wmb(); + if (c->gc_lnum == -1) { c->gc_lnum = lnum; err = LEB_RETAINED; |