1. 26 Mar, 2015 36 commits
  2. 25 Mar, 2015 4 commits
    • Sheng Yong's avatar
      UBIFS: extend debug/message capabilities · 235c362b
      Sheng Yong authored
      In the case where we have more than one volumes on different UBI
      devices, it may be not that easy to tell which volume prints the
      messages.  Add ubi number and volume id in ubifs_msg/warn/error
      to help debug. These two values are passed by struct ubifs_info.
      
      For those where ubifs_info is not initialized yet, ubifs_* is
      replaced by pr_*. For those where ubifs_info is not avaliable,
      ubifs_info is passed to the calling function as a const parameter.
      
      The output looks like,
      
      [   95.444879] UBIFS (ubi0:1): background thread "ubifs_bgt0_1" started, PID 696
      [   95.484688] UBIFS (ubi0:1): UBIFS: mounted UBI device 0, volume 1, name "test1"
      [   95.484694] UBIFS (ubi0:1): LEB size: 126976 bytes (124 KiB), min./max. I/O unit sizes: 2048 bytes/2048 bytes
      [   95.484699] UBIFS (ubi0:1): FS size: 30220288 bytes (28 MiB, 238 LEBs), journal size 1523712 bytes (1 MiB, 12 LEBs)
      [   95.484703] UBIFS (ubi0:1): reserved for root: 1427378 bytes (1393 KiB)
      [   95.484709] UBIFS (ubi0:1): media format: w4/r0 (latest is w4/r0), UUID 40DFFC0E-70BE-4193-8905-F7D6DFE60B17, small LPT model
      [   95.489875] UBIFS (ubi1:0): background thread "ubifs_bgt1_0" started, PID 699
      [   95.529713] UBIFS (ubi1:0): UBIFS: mounted UBI device 1, volume 0, name "test2"
      [   95.529718] UBIFS (ubi1:0): LEB size: 126976 bytes (124 KiB), min./max. I/O unit sizes: 2048 bytes/2048 bytes
      [   95.529724] UBIFS (ubi1:0): FS size: 19808256 bytes (18 MiB, 156 LEBs), journal size 1015809 bytes (0 MiB, 8 LEBs)
      [   95.529727] UBIFS (ubi1:0): reserved for root: 935592 bytes (913 KiB)
      [   95.529733] UBIFS (ubi1:0): media format: w4/r0 (latest is w4/r0), UUID EEB7779D-F419-4CA9-811B-831CAC7233D4, small LPT model
      
      [  954.264767] UBIFS error (ubi1:0 pid 756): ubifs_read_node: bad node type (255 but expected 6)
      [  954.367030] UBIFS error (ubi1:0 pid 756): ubifs_read_node: bad node at LEB 0:0, LEB mapping status 1
      Signed-off-by: default avatarSheng Yong <shengyong1@huawei.com>
      Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
      235c362b
    • Fabian Frederick's avatar
      UBIFS: simplify returns · 8a87dc55
      Fabian Frederick authored
      Directly return recover_head() and ubifs_leb_unmap()
      instead of storing value in err and testing it.
      Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
      Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
      8a87dc55
    • Yannick Guerrini's avatar
      UBIFS: Fix trivial typos in comments · d3f9db00
      Yannick Guerrini authored
      Change 'comress' to 'compress'
      Change 'inteval' to 'interval'
      Change 'disabe' to 'disable'
      Change 'nenver' to 'never'
      Signed-off-by: default avatarYannick Guerrini <yguerrini@tomshardware.fr>
      Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
      d3f9db00
    • Sheng Yong's avatar
      UBIFS: do not write master node if need recovery · 2c84599c
      Sheng Yong authored
      The commits 781c5717 ("UBIFS: intialize LPT earlier") and 09801194 ("UBIFS:
      fix-up free space earlier") move some initialization before marking the
      master node dirty. But the modification changes the conditions of writing
      master.
      
      If unclean umount happens, ubifs may fail when mounting. But trying to
      mount it will write new master nodes on the flash. This is useless but
      increasing sqnum. So check need_recovery before writing master node, and
      don't create new master node if filesystem needs recovery.
      
      The behavour of the bug shows at:
      http://lists.infradead.org/pipermail/linux-mtd/2015-February/057712.htmlSigned-off-by: default avatarSheng Yong <shengyong1@huawei.com>
      Reviewed-by: default avatarBen Gardiner <ben.l.gardiner@gmail.com>
      Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
      2c84599c