From: Anders Kaseorg <andersk@mit.edu>
Date: Fri, 25 Feb 2011 11:37:54 +0000 (-0500)
Subject: Fix cherry-pick of “Linux: 2.6.38: dentry->d_count is not an atomic”
X-Git-Tag: debian/1.4.14+dfsg-2~7
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=1ae7de7e2e1a6c529cfe5377e13cac82c2ba965a;p=packages%2Fo%2Fopenafs.git

Fix cherry-pick of “Linux: 2.6.38: dentry->d_count is not an atomic”

Gerrit broke this patch while cherry-picking it; see
http://gerrit.openafs.org/3999 .

Change-Id: I16c8263d4173af35e524f0ec1bc058e8c6e02ab8
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Reviewed-on: http://gerrit.openafs.org/4057
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 7350bf894444c05011a3807dd2b69b2d6c2d25c0)
---

diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
index 8b0b6f19a..3118ec73d 100644
--- a/src/afs/LINUX/osi_vnodeops.c
+++ b/src/afs/LINUX/osi_vnodeops.c
@@ -1407,7 +1407,7 @@ afs_linux_rename(struct inode *oldip, struct dentry *olddp,
     if (atomic_read(&olddp->d_count) > 1)
 	shrink_dcache_parent(olddp);
 #endif
-
+#endif
 
     AFS_GLOCK();
     code = afs_rename(VTOAFS(oldip), oldname, VTOAFS(newip), newname, credp);