---

yaml --- r: 329019 b: refs/heads/master c: 2744c17 h: refs/heads/master i: 329017: 814c4ca 329015: 93aa4fd v: v3
git-mirror · Sep 27, 2012 · 017bf2d · 017bf2d
1 parent f8d61c5
commit 017bf2d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a8ca1b6bf7069338e266082479f2f632c29afb3
+refs/heads/master: 2744c171dbaa0b1ec7639e7d0ff817fba9461a38
diff --git a/trunk/fs/ceph/inode.c b/trunk/fs/ceph/inode.c
@@ -1104,7 +1104,7 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req,
 				pr_err("fill_trace bad get_inode "
 				       "%llx.%llx\n", vino.ino, vino.snap);
 				err = PTR_ERR(in);
-				d_delete(dn);
+				d_drop(dn);
 				goto done;
 			}
 			dn = splice_dentry(dn, in, &have_lease, true);
@@ -1277,7 +1277,7 @@ int ceph_readdir_prepopulate(struct ceph_mds_request *req,
 			in = ceph_get_inode(parent->d_sb, vino);
 			if (IS_ERR(in)) {
 				dout("new_inode badness\n");
-				d_delete(dn);
+				d_drop(dn);
 				dput(dn);
 				err = PTR_ERR(in);
 				goto out;