From: Nickolai Zeldovich <kolya@mit.edu>
Date: Fri, 11 Oct 2002 01:50:40 +0000 (+0000)
Subject: Undo part of openbsd-20021010 which changes ReSortCells_cb, and
X-Git-Tag: openafs-devel-1_3_50~568
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=fa0d85ce03b05fba81f880abac4197fe8bc75776;p=packages%2Fo%2Fopenafs.git

Undo part of openbsd-20021010 which changes ReSortCells_cb, and
have it return (void *) NULL instead, which is necessary to tell
afs_TraverseCells to not stop the traversal.
---

diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c
index 2b105a25f..9f0c39c33 100644
--- a/src/afs/afs_pioctl.c
+++ b/src/afs/afs_pioctl.c
@@ -2690,7 +2690,7 @@ DECL_PIOCTL(PSetSysName)
  * l - array of cell ids which have volumes that need to be sorted
  * vlonly - sort vl servers or file servers?
  */
-static void ReSortCells_cb(struct cell *cell, void *arg)
+static void *ReSortCells_cb(struct cell *cell, void *arg)
 {
     afs_int32 *p = (afs_int32 *) arg;
     afs_int32 *l = p + 1;
@@ -2703,6 +2703,8 @@ static void ReSortCells_cb(struct cell *cell, void *arg)
 	    ReleaseWriteLock(&cell->lock);
 	}
     }
+
+    return NULL;
 }
 
 static void ReSortCells(int s, afs_int32 *l, int vlonly)