From: Mark Vitale <mvitale@sinenomine.net>
Date: Thu, 30 Nov 2017 21:51:32 +0000 (-0500)
Subject: LINUX: consolidate duplicate code in canonical_dentry
X-Git-Tag: openafs-devel-1_9_0~642
X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=0678ad26b6069040a6ea86866fb59ef5968ea343

LINUX: consolidate duplicate code in canonical_dentry

The two stanzas for HAVE_DCACHE_LOCK are now identical;
remove the preprocessor conditionals and duplicate code.

No functional change should be incurred by this commit.

Change-Id: I15cd4631d1932dcfb920313acb82fcbe570087e8
Reviewed-on: https://gerrit.openafs.org/12791
Reviewed-by: Andrew Deason <adeason@dson.org>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
---

diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
index a9394ee..d8dfd93 100644
--- a/src/afs/LINUX/osi_vnodeops.c
+++ b/src/afs/LINUX/osi_vnodeops.c
@@ -917,17 +917,10 @@ canonical_dentry(struct inode *ip)
 
     vcp->target_link = ret;
 
-# ifdef HAVE_DCACHE_LOCK
     if (ret) {
 	afs_linux_dget(ret);
     }
     afs_d_alias_unlock(ip);
-# else
-    if (ret) {
-	afs_linux_dget(ret);
-    }
-    afs_d_alias_unlock(ip);
-# endif
 
     return ret;
 }