Commit 098e7f16 authored Sep 16, 2013 by Linus Torvalds

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

parents d8efd82e c23e9b75

fs/ubifs/debug.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -2587,10 +2587,11 @@ int dbg_leb_write(struct ubifs_info c, int lnum, const void buf,
		return -EROFS;

		failing = power_cut_emulated(c, lnum, 1);
		if (failing)
		if (failing) {
		len = corrupt_data(c, buf, len);
		ubifs_warn("actually write %d bytes to LEB %d:%d (the buffer was corrupted)",
		len, lnum, offs);
		}
		err = ubi_leb_write(c->ubi, lnum, buf, offs, len);
		if (err)
		return err;

Admin message