From f0b1d3304a62d438d99664dd81b4e4f123370f17 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 6 Apr 2011 09:35:00 -0700 Subject: [PATCH] --- yaml --- r: 251317 b: refs/heads/master c: 45e3d3eeb6578e523e100622266945ecd71723bb h: refs/heads/master i: 251315: db0089ae5ab85e71ed0242dc3c16e6ef0c9071c2 v: v3 --- [refs] | 2 +- trunk/fs/ceph/export.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f821f9d6dbf4..8d5cbfc09f45 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c454cf21645bc96668e286f6352ac2c4c895fa2 +refs/heads/master: 45e3d3eeb6578e523e100622266945ecd71723bb diff --git a/trunk/fs/ceph/export.c b/trunk/fs/ceph/export.c index f1828af09912..a610d3d67488 100644 --- a/trunk/fs/ceph/export.c +++ b/trunk/fs/ceph/export.c @@ -107,8 +107,10 @@ static struct dentry *__fh_to_dentry(struct super_block *sb, req->r_ino1 = vino; req->r_num_caps = 1; err = ceph_mdsc_do_request(mdsc, NULL, req); + inode = req->r_target_inode; + if (inode) + igrab(inode); ceph_mdsc_put_request(req); - inode = ceph_find_inode(sb, vino); if (!inode) return ERR_PTR(-ESTALE); } @@ -163,8 +165,10 @@ static struct dentry *__cfh_to_dentry(struct super_block *sb, snprintf(req->r_path2, 16, "%d", cfh->parent_name_hash); req->r_num_caps = 1; err = ceph_mdsc_do_request(mdsc, NULL, req); + inode = req->r_target_inode; + if (inode) + igrab(inode); ceph_mdsc_put_request(req); - inode = ceph_find_inode(sb, vino); if (!inode) return ERR_PTR(err ? err : -ESTALE); }