diff options
| author | Sage Weil <sage@inktank.com> | 2012-06-15 21:32:04 +0200 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2012-06-15 21:32:04 +0200 |
| commit | 9a64e8e0ace51b309fdcff4b4754b3649250382a (patch) | |
| tree | 1f0d75c196c5ab0408c55ed6cf3a152f1f921e15 /fs/ceph/super.c | |
| parent | libceph: flush msgr queue during mon_client shutdown (diff) | |
| parent | Linux 3.5-rc1 (diff) | |
| download | linux-9a64e8e0ace51b309fdcff4b4754b3649250382a.tar.xz linux-9a64e8e0ace51b309fdcff4b4754b3649250382a.zip | |
Merge tag 'v3.5-rc1'
Linux 3.5-rc1
Conflicts:
net/ceph/messenger.c
Diffstat (limited to 'fs/ceph/super.c')
| -rw-r--r-- | fs/ceph/super.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ceph/super.c b/fs/ceph/super.c index 3663cf0cb073..1e67dd7305a4 100644 --- a/fs/ceph/super.c +++ b/fs/ceph/super.c @@ -667,9 +667,8 @@ static struct dentry *open_root_dentry(struct ceph_fs_client *fsc, dout("open_root_inode success\n"); if (ceph_ino(inode) == CEPH_INO_ROOT && fsc->sb->s_root == NULL) { - root = d_alloc_root(inode); + root = d_make_root(inode); if (!root) { - iput(inode); root = ERR_PTR(-ENOMEM); goto out; } |