diff --git a/[refs] b/[refs] index d6c5662f21d7..b14874244948 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b534e70cf5529378a1ed994492641ec0330554eb +refs/heads/master: 4fc8a6078660be781d6ddf4daddfd9d817d2a455 diff --git a/trunk/fs/jffs2/gc.c b/trunk/fs/jffs2/gc.c index f25e485ed879..32ff0373aa04 100644 --- a/trunk/fs/jffs2/gc.c +++ b/trunk/fs/jffs2/gc.c @@ -414,9 +414,7 @@ int jffs2_garbage_collect_pass(struct jffs2_sb_info *c) /* Eep. This really should never happen. GC is broken */ printk(KERN_ERR "Error garbage collecting node at %08x!\n", ref_offset(jeb->gc_node)); ret = -ENOSPC; - } else if (ref_offset(jeb->gc_node) == 0x1c616bdc) - printk(KERN_ERR "Wheee. Correctly GC'd node at %08x\n", ref_offset(jeb->gc_node)); - + } release_sem: up(&c->alloc_sem);