tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubifs

Pull ubifs fix from Artem Bityutskiy:
"Just one patch which fixes the power-cut recovery testing mode.

I'll start using a single UBI/UBIFS tree instead of 2 trees from now
on. So in the future you'll get 1 small pull request instead of 2
tiny ones"

* tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubifs:
UBIFS: remove invalid warn msg with tst_recovery enabled

Linus Torvalds 098e7f16 d8efd82e

+4 -3
+4 -3
fs/ubifs/debug.c
··· 2587 2587 return -EROFS; 2588 2588 2589 2589 failing = power_cut_emulated(c, lnum, 1); 2590 - if (failing) 2590 + if (failing) { 2591 2591 len = corrupt_data(c, buf, len); 2592 - ubifs_warn("actually write %d bytes to LEB %d:%d (the buffer was corrupted)", 2593 - len, lnum, offs); 2592 + ubifs_warn("actually write %d bytes to LEB %d:%d (the buffer was corrupted)", 2593 + len, lnum, offs); 2594 + } 2594 2595 err = ubi_leb_write(c->ubi, lnum, buf, offs, len); 2595 2596 if (err) 2596 2597 return err;