From: Andrew Deason <adeason@sinenomine.net>
Date: Mon, 16 May 2011 20:16:30 +0000 (-0500)
Subject: viced: Don't VTakeOffline_r without glock
X-Git-Tag: upstream/1.8.0_pre1^2~3745
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=ef0ac2fbb026385f2306189230c2cff8706dff06;p=packages%2Fo%2Fopenafs.git

viced: Don't VTakeOffline_r without glock

We don't have the volume glock, so don't call _r functions.

Change-Id: I7779412fdf1333941d320234e64000dfbfed0f4f
Reviewed-on: http://gerrit.openafs.org/4669
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
---

diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c
index b2dac045f..046aed2a1 100644
--- a/src/viced/afsfileprocs.c
+++ b/src/viced/afsfileprocs.c
@@ -1397,7 +1397,7 @@ DeleteTarget(Vnode * parentptr, Volume * volptr, Vnode ** targetptr,
 	return (EINVAL);
 
     if (CheckLength(volptr, parentptr, -1)) {
-	VTakeOffline_r(volptr);
+	VTakeOffline(volptr);
 	return VSALVAGE;
     }
 
@@ -1814,7 +1814,7 @@ Alloc_NewVnode(Vnode * parentptr, DirHandle * dir, Volume * volptr,
 
     if (CheckLength(volptr, parentptr, -1)) {
 	VAdjustDiskUsage(&temp, volptr, -BlocksPreallocatedForVnode, 0);
-	VTakeOffline_r(volptr);
+	VTakeOffline(volptr);
 	return VSALVAGE;
     }