From: David Howells <dhowells@redhat.com>
Date: Tue, 30 Jun 2020 15:29:01 +0000 (+0100)
Subject: xg: Fix vldb.xg
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b0d90f6f1c717c1935ebf90cb47f8ce7d33832b3;p=users%2Fdhowells%2Fkafs-utils.git

xg: Fix vldb.xg

Signed-off-by: David Howells <dhowells@redhat.com>
---

diff --git a/rpc-api/vldb.xg b/rpc-api/vldb.xg
index ee025c9..7bd3210 100644
--- a/rpc-api/vldb.xg
+++ b/rpc-api/vldb.xg
@@ -273,7 +273,7 @@ struct uvldbentry {
 	uint32_t volumeId[MAXTYPES];
 	uint32_t cloneId;
 	uint32_t flags;
-	uint32_t spares1;
+	uint32_t matchindex; /* MSW=VLSF_*; LSW=matched location record */
 	uint32_t spares2;
 	uint32_t spares3;
 	uint32_t spares4;
@@ -377,7 +377,7 @@ ListEntry (IN uint32_t previous_index,
 	   OUT vldbentry *entry) = VLLISTENTRY;
 
 ListAttributes (IN VldbListByAttributes *attributes,
-		OUT uint32_t *nentries,
+		OUT int32_t *nentries,
 		OUT bulkentries *blkentries) = VLLISTATTRIBUTES;
 
 #if 0
@@ -420,7 +420,7 @@ ListEntryN(IN uint32_t previous_index,
 	   OUT nvldbentry *entry) = VLLISTENTRYN;
 
 ListAttributesN (IN VldbListByAttributes *attributes,
-		 OUT uint32_t *nentries,
+		 OUT int32_t *nentries,
 		 OUT nbulkentries *blkentries) = VLLISTATTRIBUTESN;
 
 #if 0
@@ -452,8 +452,8 @@ LinkedListU() = VLLINKEDLISTU;
 
 GetAddrsU(IN ListAddrByAttributes *inaddr,
 	  OUT afsUUID *uuidp1,
-	  OUT uint32_t *uniquifier,
-	  OUT uint32_t *nentries,
+	  OUT int32_t *uniquifier,
+	  OUT int32_t *nentries,
 	  OUT bulkaddrs *blkaddrs) = VLGETADDRSU;
 
 
@@ -464,10 +464,10 @@ RegisterAddrs(IN afsUUID *uid,
 
 ListAttributesN2(IN VldbListByAttributes *attributes,
 		 IN string volumename<VLDB_MAXNAMELEN>,
-		 IN  uint32_t startindex,
-		 OUT uint32_t *nentries,
+		 IN  int32_t startindex,
+		 OUT int32_t *nentries,
 		 OUT nbulkentries *blkentries,
-		 OUT uint32_t *nextstartindex) = VLLISTATTRIBUTESN2;
+		 OUT int32_t *nextstartindex) = VLLISTATTRIBUTESN2;
 
 GetCapabilities(
 	OUT Capabilities *capabilities