Merge branch 'at91' into devel

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;