lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2013-09-16 15:36:55 -04:00
parent d8efd82eec c23e9b75cc
commit 098e7f1665
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fs/ubifs/debug.c
View File

@@ -2587,10 +2587,11 @@ int dbg_leb_write(struct ubifs_info *c, int lnum, const void *buf,
return -EROFS; return -EROFS;
failing = power_cut_emulated(c, lnum, 1); failing = power_cut_emulated(c, lnum, 1);
if (failing) if (failing) {
len = corrupt_data(c, buf, len); len = corrupt_data(c, buf, len);
ubifs_warn("actually write %d bytes to LEB %d:%d (the buffer was corrupted)", ubifs_warn("actually write %d bytes to LEB %d:%d (the buffer was corrupted)",
len, lnum, offs); len, lnum, offs);
}
err = ubi_leb_write(c->ubi, lnum, buf, offs, len); err = ubi_leb_write(c->ubi, lnum, buf, offs, len);
if (err) if (err)
return err; return err;