Skip to contentSkip to conversation

2.5.4[4,5] AFS dir.c compile fix

miniPATCH Jan Marek 1 participant 2 messages Oct 31, 2002 Afs filesystem

lore
Share & tools
lore

Jan Marek

author
#0 lore raw

Hallo,

thist patch is needed for compile AFS with compiler gcc version prior 3.0. Have been accepted by Alan Cox in 2.5.44-ac3...

Please apply...

Sincerely
Jan Marek

Signature · 4 lines
Ing. Jan Marek
University of South Bohemia
Academic Computer Centre
Phone: +420-38-7772080
author
#1 lore raw

Hallo,

Quoted 6 lines · Jan Marek

Hallo,

thist patch is needed for compile AFS with compiler gcc version prior 3.0. Have been accepted by Alan Cox in 2.5.44-ac3...

Please apply...

:-( And here is patch... :-)

Sorry...

Sincerely
Jan Marek

Signature · 4 lines
Ing. Jan Marek
University of South Bohemia
Academic Computer Centre
Phone: +420-38-7772080
fs/afs/dir.c renamed from fs/afs/dir.c.old +5 -5
@@ -72,7 +72,7 @@
 		u8	name[16];
 		u8	overflow[4];	/* if any char of the name (inc NUL) reaches here, consume
 					 * the next dirent too */
-	};
+	} parts;
 	u8	extended_name[32];
 } afs_dirent_t;
 

@@ -258,7 +258,7 @@
 
 		/* got a valid entry */
 		dire = &block->dirents[offset];
-		nlen = strnlen(dire->name,sizeof(*block) - offset*sizeof(afs_dirent_t));
+		nlen = strnlen(dire->parts.name,sizeof(*block) - offset*sizeof(afs_dirent_t));
 
 		_debug("ENT[%u.%u]: %s %u \"%.*s\"\n",
 		       blkoff/sizeof(afs_dir_block_t),offset,

@@ -290,11 +290,11 @@
 
 		/* found the next entry */
 		ret = filldir(cookie,
-			      dire->name,
+			      dire->parts.name,
 			      nlen,
 			      blkoff + offset * sizeof(afs_dirent_t),
-			      ntohl(dire->vnode),
-			      filldir==afs_dir_lookup_filldir ? dire->unique : DT_UNKNOWN);
+			      ntohl(dire->parts.vnode),
+			      filldir==afs_dir_lookup_filldir ? dire->parts.unique : DT_UNKNOWN);
 		if (ret<0) {
 			_leave(" = 0 [full]");
 			return 0;