From 017bf2d06d02cb2ba56f062263adbb43e6576888 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 26 Sep 2012 21:41:05 -0400
Subject: [PATCH] --- yaml --- r: 329019 b: refs/heads/master c:
 2744c171dbaa0b1ec7639e7d0ff817fba9461a38 h: refs/heads/master i:   329017:
 814c4ca8f4d33c2fee5336ae5c42a379b9bb3608   329015:
 93aa4fdb14bcab95f591859f287b8b2d6b795031 v: v3

---
 [refs]                | 2 +-
 trunk/fs/ceph/inode.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3c3b433c195d..fb7882671409 100644
--- 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
index 4b5762ef7c2b..ba95eea201bf 100644
--- 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;