patch-2.4.0-test2 linux/fs/nfsd/nfsxdr.c

• Lines: 15
• Date: Fri Jun 23 21:22:12 2000
• Orig file: v2.4.0-test1/linux/fs/nfsd/nfsxdr.c
• Orig date: Fri Mar 10 16:40:48 2000

diff -u --recursive --new-file v2.4.0-test1/linux/fs/nfsd/nfsxdr.c linux/fs/nfsd/nfsxdr.c
@@ -412,11 +412,9 @@
 		cd->eob = 1;
 		return -EINVAL;
 	}
-	*p++ = xdr_one;			/* mark entry present */
-	*p++ = htonl((u32) ino);	/* file id */
-	*p++ = htonl((u32) namlen);	/* name length & name */
-	memcpy(p, name, namlen);
-	p += slen;
+	*p++ = xdr_one;				/* mark entry present */
+	*p++ = htonl((u32) ino);		/* file id */
+	p    = xdr_encode_array(p, name, namlen);/* name length & name */
 	cd->offset = p;			/* remember pointer */
 	*p++ = ~(u32) 0;		/* offset of next entry */