Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 098e7f1665f1a3503524bdd537499e45ad30e67d

Authored by Linus Torvalds
2 parents d8efd82eec c23e9b75cc
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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

Showing 1 changed file Side-by-side Diff

... ... @@ -2587,10 +2587,11 @@
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;