linux-kernel - linux-next: manual merge of the l2-mtd tree with the vfs tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20120313141859.302878a8e2246979c288440d@canb.auug.org.au>
Date:	Tue, 13 Mar 2012 14:18:59 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Artem Bityutskiy <dedekind1@...il.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Al Viro <viro@...iv.linux.org.uk>,
	Joe Perches <joe@...ches.com>
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@...b.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;

Content of type "application/pgp-signature" skipped