From: Marc Dionne <marc.dionne@your-file-system.com>
Date: Wed, 29 May 2013 14:33:44 +0000 (-0400)
Subject: Linux: Remove extra "goto out" from tmpfs fix
X-Git-Tag: upstream/1.6.5.2^2~2
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=05c45dc0969c51346c9562973ab31a35cfb8eb31;p=packages%2Fo%2Fopenafs.git

Linux: Remove extra "goto out" from tmpfs fix

Remove a stray "goto out" that should not have been applied in
this spot along with the tmpfs fix.

Thanks to Stephan Wiesand for pointing it out.

Reviewed-on: http://gerrit.openafs.org/9953
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
(cherry picked from commit f393612d8f0a121d0cb8755f3eb9913c0f09606d)

Reviewed-on: http://gerrit.openafs.org/10193
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
(cherry picked from commit 86ce4dcac924440c29024906bfda89e8d6f030a7)

Change-Id: Ic81399e7ac9c2034f02e95b9cbc335d79d0f00fa
Reviewed-on: http://gerrit.openafs.org/10613
Tested-by: Stephan Wiesand <stephan.wiesand@desy.de>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
---

diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
index d1a62bb4a..0c306248a 100644
--- a/src/afs/LINUX/osi_vnodeops.c
+++ b/src/afs/LINUX/osi_vnodeops.c
@@ -2359,7 +2359,6 @@ afs_linux_readpages(struct file *fp, struct address_space *mapping,
 		ObtainReadLock(&tdc->lock);
 		if (!hsame(avc->f.m.DataVersion, tdc->f.versionNo) ||
 		    (tdc->dflags & DFFetching)) {
-		    goto out;
 		    ReleaseReadLock(&tdc->lock);
 		    afs_PutDCache(tdc);
 		    tdc = NULL;