From 0f94fd9eb55308a542135269c5f0bd6d4b5994f4 Mon Sep 17 00:00:00 2001
From: Derrick Brashear <shadow@dementia.org>
Date: Mon, 31 Jul 2006 16:18:51 +0000
Subject: [PATCH] 
 STABLE14-call-bzero-in-convertvolumeinfo-with-correct-size-for-dotreadonly-20060731

FIXES 36442

and slipstream in bzero() killing


(cherry picked from commit 8d2dbc51f40e61cbe6157c910dff18606cf84282)
---
 src/vol/namei_ops.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vol/namei_ops.c b/src/vol/namei_ops.c
index 0d141b25ba..76cf09b4dc 100644
--- a/src/vol/namei_ops.c
+++ b/src/vol/namei_ops.c
@@ -1468,7 +1468,7 @@ convertVolumeInfo(fdr, fdw, vid)
 				 * the old RW volume around */
     p = strrchr(vd.name, '.');
     if (p && !strcmp(p, ".readonly")) {
-	bzero(p, 8);
+	memset(p, 0, 9);
     }
     if (write(fdw, &vd, sizeof(struct VolumeDiskData)) !=
 	sizeof(struct VolumeDiskData)) {
@@ -1582,7 +1582,7 @@ namei_ConvertROtoRWvolume(IHandle_t * h, afs_uint32 vid)
      * proceed.
      */
 
-    bzero(&t_ih, sizeof(t_ih));
+    memset(&t_ih, 0, sizeof(t_ih));
     t_ih.ih_dev = h->ih_dev;
     t_ih.ih_vid = h->ih_vid;