Messages in this thread | | | Date | Tue, 13 Mar 2012 14:18:59 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the l2-mtd tree with the vfs tree |
| |
Hi Artem,
Today's linux-next merge of the l2-mtd tree got a conflict in fs/jffs2/fs.c between commit de071e1a7466 ("switch open-coded instances of d_make_root() to new helper") from the vfs tree and commit ab9b393d6ee8 ("jffs2: Convert most D1/D2 macros to jffs2_dbg") from the l2-mtd tree.
Just context changes. I fixed it up (see below) and can carry the fix as necessary.
[Al, I suspect that your patch should have changed the debug print as well ...]
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/jffs2/fs.c index c0d5c9d,43052fa..0000000 --- a/fs/jffs2/fs.c +++ b/fs/jffs2/fs.c @@@ -560,10 -572,10 +572,10 @@@ int jffs2_do_fill_super(struct super_bl ret = -ENOMEM; - D1(printk(KERN_DEBUG "jffs2_do_fill_super(): d_alloc_root()\n")); + jffs2_dbg(1, "%s(): d_alloc_root()\n", __func__); - sb->s_root = d_alloc_root(root_i); + sb->s_root = d_make_root(root_i); if (!sb->s_root) - goto out_root_i; + goto out_root; sb->s_maxbytes = 0xFFFFFFFF; sb->s_blocksize = PAGE_CACHE_SIZE; [unhandled content-type:application/pgp-signature] | |