From: Yan, Zheng <zheng.z.yan@intel.com>
Date: Mon, 2 Sep 2013 07:19:54 +0000 (+0800)
Subject: ceph: use d_invalidate() to invalidate aliases
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~10205^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a8d436f015b627a55ec3b1d15f13d6ab92dd892b;p=mirror_ubuntu-zesty-kernel.git

ceph: use d_invalidate() to invalidate aliases

d_invalidate() is the standard VFS method to invalidate dentry.
compare to d_delete(), it also try shrinking children dentries.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Reviewed-by: Sage Weil <sage@inktank.com>
---

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 7b451eb7d123..13976c33332e 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -2346,10 +2346,10 @@ static void invalidate_aliases(struct inode *inode)
 	d_prune_aliases(inode);
 	/*
 	 * For non-directory inode, d_find_alias() only returns
-	 * connected dentry. After calling d_delete(), the dentry
-	 * become disconnected.
+	 * connected dentry. After calling d_invalidate(), the
+	 * dentry become disconnected.
 	 *
-	 * For directory inode, d_find_alias() only can return
+	 * For directory inode, d_find_alias() can return
 	 * disconnected dentry. But directory inode should have
 	 * one alias at most.
 	 */
@@ -2358,7 +2358,7 @@ static void invalidate_aliases(struct inode *inode)
 			dput(dn);
 			break;
 		}
-		d_delete(dn);
+		d_invalidate(dn);
 		if (prev)
 			dput(prev);
 		prev = dn;