Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

* 'linux-next' of git://git.infradead.org/ubifs-2.6: (25 commits)
  UBIFS: fix ubifs_compress commentary
  UBIFS: amend printk
  UBIFS: do not read unnecessary bytes when unpacking bits
  UBIFS: check buffer length when scanning for LPT nodes
  UBIFS: correct condition to eliminate unecessary assignment
  UBIFS: add more debugging messages for LPT
  UBIFS: fix bulk-read handling uptodate pages
  UBIFS: improve garbage collection
  UBIFS: allow for sync_fs when read-only
  UBIFS: commit on sync_fs
  UBIFS: correct comment for commit_on_unmount
  UBIFS: update dbg_dump_inode
  UBIFS: fix commentary
  UBIFS: fix races in bit-fields
  UBIFS: ensure data read beyond i_size is zeroed out correctly
  UBIFS: correct key comparison
  UBIFS: use bit-fields when possible
  UBIFS: check data CRC when in error state
  UBIFS: improve znode splitting rules
  UBIFS: add no_chk_data_crc mount option
  ...

1 files changed, 62 insertions, 17 deletions

diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
index d7f7645779f2..7186400750e7 100644
--- a/fs/ubifs/debug.c
+++ b/fs/ubifs/debug.c
@@ -222,30 +222,38 @@ void dbg_dump_inode(const struct ubifs_info *c, const struct inode *inode)
 {
         const struct ubifs_inode *ui = ubifs_inode(inode);
 
-        printk(KERN_DEBUG "inode      %lu\n", inode->i_ino);
-        printk(KERN_DEBUG "size       %llu\n",
+        printk(KERN_DEBUG "Dump in-memory inode:");
+        printk(KERN_DEBUG "\tinode          %lu\n", inode->i_ino);
+        printk(KERN_DEBUG "\tsize           %llu\n",
                (unsigned long long)i_size_read(inode));
-        printk(KERN_DEBUG "nlink      %u\n", inode->i_nlink);
-        printk(KERN_DEBUG "uid        %u\n", (unsigned int)inode->i_uid);
-        printk(KERN_DEBUG "gid        %u\n", (unsigned int)inode->i_gid);
-        printk(KERN_DEBUG "atime      %u.%u\n",
+        printk(KERN_DEBUG "\tnlink          %u\n", inode->i_nlink);
+        printk(KERN_DEBUG "\tuid            %u\n", (unsigned int)inode->i_uid);
+        printk(KERN_DEBUG "\tgid            %u\n", (unsigned int)inode->i_gid);
+        printk(KERN_DEBUG "\tatime          %u.%u\n",
                (unsigned int)inode->i_atime.tv_sec,
                (unsigned int)inode->i_atime.tv_nsec);
-        printk(KERN_DEBUG "mtime      %u.%u\n",
+        printk(KERN_DEBUG "\tmtime          %u.%u\n",
                (unsigned int)inode->i_mtime.tv_sec,
                (unsigned int)inode->i_mtime.tv_nsec);
-        printk(KERN_DEBUG "ctime       %u.%u\n",
+        printk(KERN_DEBUG "\tctime          %u.%u\n",
                (unsigned int)inode->i_ctime.tv_sec,
                (unsigned int)inode->i_ctime.tv_nsec);
-        printk(KERN_DEBUG "creat_sqnum %llu\n", ui->creat_sqnum);
-        printk(KERN_DEBUG "xattr_size  %u\n", ui->xattr_size);
-        printk(KERN_DEBUG "xattr_cnt   %u\n", ui->xattr_cnt);
-        printk(KERN_DEBUG "xattr_names %u\n", ui->xattr_names);
-        printk(KERN_DEBUG "dirty       %u\n", ui->dirty);
-        printk(KERN_DEBUG "xattr       %u\n", ui->xattr);
-        printk(KERN_DEBUG "flags       %d\n", ui->flags);
-        printk(KERN_DEBUG "compr_type  %d\n", ui->compr_type);
-        printk(KERN_DEBUG "data_len    %d\n", ui->data_len);
+        printk(KERN_DEBUG "\tcreat_sqnum    %llu\n", ui->creat_sqnum);
+        printk(KERN_DEBUG "\txattr_size     %u\n", ui->xattr_size);
+        printk(KERN_DEBUG "\txattr_cnt      %u\n", ui->xattr_cnt);
+        printk(KERN_DEBUG "\txattr_names    %u\n", ui->xattr_names);
+        printk(KERN_DEBUG "\tdirty          %u\n", ui->dirty);
+        printk(KERN_DEBUG "\txattr          %u\n", ui->xattr);
+        printk(KERN_DEBUG "\tbulk_read      %u\n", ui->xattr);
+        printk(KERN_DEBUG "\tsynced_i_size  %llu\n",
+               (unsigned long long)ui->synced_i_size);
+        printk(KERN_DEBUG "\tui_size        %llu\n",
+               (unsigned long long)ui->ui_size);
+        printk(KERN_DEBUG "\tflags          %d\n", ui->flags);
+        printk(KERN_DEBUG "\tcompr_type     %d\n", ui->compr_type);
+        printk(KERN_DEBUG "\tlast_page_read %lu\n", ui->last_page_read);
+        printk(KERN_DEBUG "\tread_in_a_row  %lu\n", ui->read_in_a_row);
+        printk(KERN_DEBUG "\tdata_len       %d\n", ui->data_len);
 }
 
 void dbg_dump_node(const struct ubifs_info *c, const void *node)
@@ -647,6 +655,43 @@ void dbg_dump_lprops(struct ubifs_info *c)
         }
 }
 
+void dbg_dump_lpt_info(struct ubifs_info *c)
+{
+        int i;
+
+        spin_lock(&dbg_lock);
+        printk(KERN_DEBUG "\tlpt_sz:        %lld\n", c->lpt_sz);
+        printk(KERN_DEBUG "\tpnode_sz:      %d\n", c->pnode_sz);
+        printk(KERN_DEBUG "\tnnode_sz:      %d\n", c->nnode_sz);
+        printk(KERN_DEBUG "\tltab_sz:       %d\n", c->ltab_sz);
+        printk(KERN_DEBUG "\tlsave_sz:      %d\n", c->lsave_sz);
+        printk(KERN_DEBUG "\tbig_lpt:       %d\n", c->big_lpt);
+        printk(KERN_DEBUG "\tlpt_hght:      %d\n", c->lpt_hght);
+        printk(KERN_DEBUG "\tpnode_cnt:     %d\n", c->pnode_cnt);
+        printk(KERN_DEBUG "\tnnode_cnt:     %d\n", c->nnode_cnt);
+        printk(KERN_DEBUG "\tdirty_pn_cnt:  %d\n", c->dirty_pn_cnt);
+        printk(KERN_DEBUG "\tdirty_nn_cnt:  %d\n", c->dirty_nn_cnt);
+        printk(KERN_DEBUG "\tlsave_cnt:     %d\n", c->lsave_cnt);
+        printk(KERN_DEBUG "\tspace_bits:    %d\n", c->space_bits);
+        printk(KERN_DEBUG "\tlpt_lnum_bits: %d\n", c->lpt_lnum_bits);
+        printk(KERN_DEBUG "\tlpt_offs_bits: %d\n", c->lpt_offs_bits);
+        printk(KERN_DEBUG "\tlpt_spc_bits:  %d\n", c->lpt_spc_bits);
+        printk(KERN_DEBUG "\tpcnt_bits:     %d\n", c->pcnt_bits);
+        printk(KERN_DEBUG "\tlnum_bits:     %d\n", c->lnum_bits);
+        printk(KERN_DEBUG "\tLPT root is at %d:%d\n", c->lpt_lnum, c->lpt_offs);
+        printk(KERN_DEBUG "\tLPT head is at %d:%d\n",
+               c->nhead_lnum, c->nhead_offs);
+        printk(KERN_DEBUG "\tLPT ltab is at %d:%d\n", c->ltab_lnum, c->ltab_offs);
+        if (c->big_lpt)
+                printk(KERN_DEBUG "\tLPT lsave is at %d:%d\n",
+                       c->lsave_lnum, c->lsave_offs);
+        for (i = 0; i < c->lpt_lebs; i++)
+                printk(KERN_DEBUG "\tLPT LEB %d free %d dirty %d tgc %d "
+                       "cmt %d\n", i + c->lpt_first, c->ltab[i].free,
+                       c->ltab[i].dirty, c->ltab[i].tgc, c->ltab[i].cmt);
+        spin_unlock(&dbg_lock);
+}
+
 void dbg_dump_leb(const struct ubifs_info *c, int lnum)
 {
         struct ubifs_scan_leb *sleb;