Merge tag 'upstream-3.7-rc1' of git://git.infradead.org/linux-ubifs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Oct 2012 03:47:48 +0000 (20:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Oct 2012 03:47:48 +0000 (20:47 -0700)
Pull ubifs changes from Artem Bityutskiy:
 "No big changes for 3.7 in UBIFS:
   - Error reporting and debug printing improvements
   - Power cut emulation fixes
   - Minor cleanups"

Fix trivial conflict in fs/ubifs/debug.c due to the user namespace
changes.

* tag 'upstream-3.7-rc1' of git://git.infradead.org/linux-ubifs:
  UBIFS: print less
  UBIFS: use pr_ helper instead of printk
  UBIFS: comply with coding style
  UBIFS: use __aligned() attribute
  UBIFS: remove __DATE__ and __TIME__
  UBIFS: fix power cut emulation for mtdram
  UBIFS: improve scanning debug output
  UBIFS: always print full error reports
  UBIFS: print PID in debug messages

1  2 
fs/ubifs/budget.c
fs/ubifs/debug.c
fs/ubifs/sb.c
fs/ubifs/super.c
fs/ubifs/ubifs.h

Simple merge
index 340d1afc1302406942a09739e9adfe6790e2fac9,2714e02093a488aea52d550313d7501d75d320e9..62911637e12f3123742ad0e96cc1cc0829f7f2e3
@@@ -238,38 -238,38 +238,38 @@@ void ubifs_dump_inode(struct ubifs_inf
        struct ubifs_dent_node *dent, *pdent = NULL;
        int count = 2;
  
-       printk(KERN_ERR "Dump in-memory inode:");
-       printk(KERN_ERR "\tinode          %lu\n", inode->i_ino);
-       printk(KERN_ERR "\tsize           %llu\n",
+       pr_err("Dump in-memory inode:");
+       pr_err("\tinode          %lu\n", inode->i_ino);
+       pr_err("\tsize           %llu\n",
               (unsigned long long)i_size_read(inode));
-       printk(KERN_ERR "\tnlink          %u\n", inode->i_nlink);
-       printk(KERN_ERR "\tuid            %u\n", (unsigned int)i_uid_read(inode));
-       printk(KERN_ERR "\tgid            %u\n", (unsigned int)i_gid_read(inode));
-       printk(KERN_ERR "\tatime          %u.%u\n",
+       pr_err("\tnlink          %u\n", inode->i_nlink);
 -      pr_err("\tuid            %u\n", (unsigned int)inode->i_uid);
 -      pr_err("\tgid            %u\n", (unsigned int)inode->i_gid);
++      pr_err("\tuid            %u\n", (unsigned int)i_uid_read(inode));
++      pr_err("\tgid            %u\n", (unsigned int)i_gid_read(inode));
+       pr_err("\tatime          %u.%u\n",
               (unsigned int)inode->i_atime.tv_sec,
               (unsigned int)inode->i_atime.tv_nsec);
-       printk(KERN_ERR "\tmtime          %u.%u\n",
+       pr_err("\tmtime          %u.%u\n",
               (unsigned int)inode->i_mtime.tv_sec,
               (unsigned int)inode->i_mtime.tv_nsec);
-       printk(KERN_ERR "\tctime          %u.%u\n",
+       pr_err("\tctime          %u.%u\n",
               (unsigned int)inode->i_ctime.tv_sec,
               (unsigned int)inode->i_ctime.tv_nsec);
-       printk(KERN_ERR "\tcreat_sqnum    %llu\n", ui->creat_sqnum);
-       printk(KERN_ERR "\txattr_size     %u\n", ui->xattr_size);
-       printk(KERN_ERR "\txattr_cnt      %u\n", ui->xattr_cnt);
-       printk(KERN_ERR "\txattr_names    %u\n", ui->xattr_names);
-       printk(KERN_ERR "\tdirty          %u\n", ui->dirty);
-       printk(KERN_ERR "\txattr          %u\n", ui->xattr);
-       printk(KERN_ERR "\tbulk_read      %u\n", ui->xattr);
-       printk(KERN_ERR "\tsynced_i_size  %llu\n",
+       pr_err("\tcreat_sqnum    %llu\n", ui->creat_sqnum);
+       pr_err("\txattr_size     %u\n", ui->xattr_size);
+       pr_err("\txattr_cnt      %u\n", ui->xattr_cnt);
+       pr_err("\txattr_names    %u\n", ui->xattr_names);
+       pr_err("\tdirty          %u\n", ui->dirty);
+       pr_err("\txattr          %u\n", ui->xattr);
+       pr_err("\tbulk_read      %u\n", ui->xattr);
+       pr_err("\tsynced_i_size  %llu\n",
               (unsigned long long)ui->synced_i_size);
-       printk(KERN_ERR "\tui_size        %llu\n",
+       pr_err("\tui_size        %llu\n",
               (unsigned long long)ui->ui_size);
-       printk(KERN_ERR "\tflags          %d\n", ui->flags);
-       printk(KERN_ERR "\tcompr_type     %d\n", ui->compr_type);
-       printk(KERN_ERR "\tlast_page_read %lu\n", ui->last_page_read);
-       printk(KERN_ERR "\tread_in_a_row  %lu\n", ui->read_in_a_row);
-       printk(KERN_ERR "\tdata_len       %d\n", ui->data_len);
+       pr_err("\tflags          %d\n", ui->flags);
+       pr_err("\tcompr_type     %d\n", ui->compr_type);
+       pr_err("\tlast_page_read %lu\n", ui->last_page_read);
+       pr_err("\tread_in_a_row  %lu\n", ui->read_in_a_row);
+       pr_err("\tdata_len       %d\n", ui->data_len);
  
        if (!S_ISDIR(inode->i_mode))
                return;
diff --cc fs/ubifs/sb.c
Simple merge
Simple merge
Simple merge