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.

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>
(cherry picked from commit 0678ad26b6)

Change-Id: If0f9516201cea747a753db04ba2d0e2cac69971b
Reviewed-on: https://gerrit.openafs.org/12849
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
This commit is contained in:
Mark Vitale 2017-11-30 16:51:32 -05:00 committed by Benjamin Kaduk
parent c42dea8e02
commit 16c0dbd796

View File

@ -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;
}