diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-16 15:36:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-16 15:36:55 -0400 |
| commit | 098e7f1665f1a3503524bdd537499e45ad30e67d (patch) | |
| tree | fe8e6ad6882bc9805ca78459f85d11309c9dc205 | |
| parent | d8efd82eece89f8a5790b0febf17522affe9e1f1 (diff) | |
| parent | c23e9b75ccd0edba81a506c7d97e0af626489256 (diff) | |
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
| -rw-r--r-- | fs/ubifs/debug.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c index 7f60e900edf..6e025e02ffd 100644 --- a/fs/ubifs/debug.c +++ b/fs/ubifs/debug.c @@ -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); + 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; |