Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / fs / ubifs / gc.c

diff --git a/fs/ubifs/gc.c b/fs/ubifs/gc.c
index ded29f6..76ca53c 100644 (file)
--- a/fs/ubifs/gc.c
+++ b/fs/ubifs/gc.c
@@ -109,7 +109,7 @@ static int switch_gc_head(struct ubifs_info *c)
                return err;
 
        c->gc_lnum = -1;
-       err = ubifs_wbuf_seek_nolock(wbuf, gc_lnum, 0, UBI_LONGTERM);
+       err = ubifs_wbuf_seek_nolock(wbuf, gc_lnum, 0);
        return err;
 }
 
@@ -714,9 +714,9 @@ int ubifs_garbage_collect(struct ubifs_info *c, int anyway)
                        break;
                }
 
-               dbg_gc("found LEB %d: free %d, dirty %d, sum %d "
-                      "(min. space %d)", lp.lnum, lp.free, lp.dirty,
-                      lp.free + lp.dirty, min_space);
+               dbg_gc("found LEB %d: free %d, dirty %d, sum %d (min. space %d)",
+                      lp.lnum, lp.free, lp.dirty, lp.free + lp.dirty,
+                      min_space);
 
                space_before = c->leb_size - wbuf->offs - wbuf->used;
                if (wbuf->lnum == -1)