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  PHC 
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:	Tue, 10 Jan 2012 17:35:36 -0800 (PST)
From:	Sage Weil <>
To:	Al Viro <>
cc:	Stephen Rothwell <>,,,
	Alex Elder <>
Subject: Re: linux-next: manual merge of the ceph tree with Linus' tree

On Wed, 11 Jan 2012, Al Viro wrote:
> On Wed, Jan 11, 2012 at 12:27:44PM +1100, Stephen Rothwell wrote:
> > Hi Sage,
> > 
> > Today's linux-next merge of the ceph tree got a conflict in
> > fs/ceph/super.c between commit 3c5184ef1216 ("ceph: d_alloc_root() may
> > fail") from Linus' tree and commit 26d913cdd955 ("ceph: always initialize
> > the dentry in open_root_dentry()") from the ceph tree.
> > 
> > I fixed it up (see below) and can carry the fix as necessary.
> Ahem...  
> >  +			root = d_obtain_alias(inode);
> >  +		}
> > + 		ceph_init_dentry(root);
> What will happen if dentry returned by d_obtain_alias() had already existed?

ceph_init_dentry() bails out immediately if d_fsdata is non-NULL.

BTW, should I let Linus resolve this, or merge his master back into my 
tree, or rebase onto his master?

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to
More majordomo info at
Please read the FAQ at

Powered by blists - more mailing lists