linux-next: manual merge of the userns tree with the ubifs tree

[Stephen Rothwell]

Hi Eric,

Today's linux-next merge of the userns tree got a conflict in
fs/ubifs/debug.c between commit 6b38d03f48da ("UBIFS: use pr_ helper
instead of printk") from the ubifs tree and commit 39241beb78f6 ("userns:
Convert ubifs to use kuid/kgid") from the userns tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc fs/ubifs/debug.c
index 2714e02,340d1af..0000000
--- a/fs/ubifs/debug.c
+++ b/fs/ubifs/debug.c
@@@ -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;

Attachment: pgp00000.pgp
Description: PGP signature