linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Al Viro <viro@ZenIV.linux.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Sage Weil <sage@newdream.net>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Alex Elder <elder@dreamhost.com>
Subject: Re: linux-next: manual merge of the ceph tree with Linus' tree
Date: Wed, 11 Jan 2012 01:31:27 +0000	[thread overview]
Message-ID: <20120111013127.GE23916@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20120111122744.7db3bfb91d79b1307db02228@canb.auug.org.au>

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?

  reply	other threads:[~2012-01-11  1:31 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-11  1:27 linux-next: manual merge of the ceph tree with Linus' tree Stephen Rothwell
2012-01-11  1:31 ` Al Viro [this message]
2012-01-11  1:35   ` Sage Weil
2012-01-11  1:49     ` Al Viro
2012-01-11  3:02     ` Stephen Rothwell
2012-01-11  2:10   ` Alex Elder
  -- strict thread matches above, loose matches on Subject: below --
2023-11-05 22:24 Stephen Rothwell
2013-07-10  1:24 Stephen Rothwell
2013-07-10  3:57 ` Sage Weil
2013-06-19  1:22 Stephen Rothwell
2013-04-18  1:34 Stephen Rothwell
2012-07-31  1:58 Stephen Rothwell
2012-07-21 23:16 Stephen Rothwell
2012-05-22  1:45 Stephen Rothwell
2012-05-22  3:58 ` Sage Weil
2012-03-21  1:23 Stephen Rothwell
2010-12-15  0:14 Stephen Rothwell
2010-09-23  1:04 Stephen Rothwell
2010-09-23  0:56 Stephen Rothwell
2010-09-23  0:29 Stephen Rothwell
2010-09-23  3:36 ` Sage Weil
2010-08-13  0:28 Stephen Rothwell
2010-05-14  0:07 Stephen Rothwell
2010-05-14  0:07 Stephen Rothwell
2010-05-14  0:07 Stephen Rothwell
2010-05-14  4:25 ` Sage Weil
2010-05-14  6:00   ` Stephen Rothwell
2010-01-12  0:09 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120111013127.GE23916@ZenIV.linux.org.uk \
    --to=viro@zeniv.linux.org.uk \
    --cc=elder@dreamhost.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sage@newdream.net \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).