From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Sage Weil <sage@newdream.net>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Alex Elder <elder@dreamhost.com>,
Al Viro <viro@zeniv.linux.org.uk>
Subject: linux-next: manual merge of the ceph tree with Linus' tree
Date: Wed, 11 Jan 2012 12:27:44 +1100 [thread overview]
Message-ID: <20120111122744.7db3bfb91d79b1307db02228@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1473 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/ceph/super.c
index 48f61a1,ec74313..0000000
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@@ -636,21 -636,14 +636,21 @@@ static struct dentry *open_root_dentry(
req->r_num_caps = 2;
err = ceph_mdsc_do_request(mdsc, NULL, req);
if (err == 0) {
+ struct inode *inode = req->r_target_inode;
+ req->r_target_inode = NULL;
dout("open_root_inode success\n");
- if (ceph_ino(req->r_target_inode) == CEPH_INO_ROOT &&
- fsc->sb->s_root == NULL)
- root = d_alloc_root(req->r_target_inode);
- else
- root = d_obtain_alias(req->r_target_inode);
+ if (ceph_ino(inode) == CEPH_INO_ROOT &&
+ fsc->sb->s_root == NULL) {
+ root = d_alloc_root(inode);
+ if (!root) {
+ iput(inode);
+ root = ERR_PTR(-ENOMEM);
+ goto out;
+ }
- ceph_init_dentry(root);
+ } else {
+ root = d_obtain_alias(inode);
+ }
+ ceph_init_dentry(root);
- req->r_target_inode = NULL;
dout("open_root_inode success, root dentry is %p\n", root);
} else {
root = ERR_PTR(err);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-01-11 1:27 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-11 1:27 Stephen Rothwell [this message]
2012-01-11 1:31 ` linux-next: manual merge of the ceph tree with Linus' tree Al Viro
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=20120111122744.7db3bfb91d79b1307db02228@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=elder@dreamhost.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sage@newdream.net \
--cc=viro@zeniv.linux.org.uk \
/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).