aboutsummaryrefslogtreecommitdiff
path: root/sys/fs
diff options
context:
space:
mode:
authorDoug Rabson <dfr@FreeBSD.org>1995-08-03 12:17:35 +0000
committerDoug Rabson <dfr@FreeBSD.org>1995-08-03 12:17:35 +0000
commitd2f25f26b5ca3fef1dbff447b5559de1be953a35 (patch)
tree5543e309f186e04644ec5d7353275a1912ce08f6 /sys/fs
parent7faccad982987c613dae77d724cec6191d1da410 (diff)
downloadsrc-d2f25f26b5ca3fef1dbff447b5559de1be953a35.tar.gz
src-d2f25f26b5ca3fef1dbff447b5559de1be953a35.zip
Make sure that a non-null cookie vector is returned even if there were no
valid entries in the block. Doing otherwise confuses the nfs server.
Notes
Notes: svn path=/head/; revision=9878
Diffstat (limited to 'sys/fs')
-rw-r--r--sys/fs/msdosfs/msdosfs_vnops.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index 945ca49d73ac..1c7e8b89c142 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_vnops.c,v 1.19 1995/08/01 18:50:55 davidg Exp $ */
+/* $Id: msdosfs_vnops.c,v 1.20 1995/08/02 12:59:49 dfr Exp $ */
/* $NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $ */
/*-
@@ -1554,6 +1554,14 @@ msdosfs_readdir(ap)
if (diff <= 0) {
if(ap->a_eofflag)
*ap->a_eofflag = 1;
+ if(ap->a_ncookies != NULL) {
+ u_int *cookies;
+
+ MALLOC(cookies, u_int *, 1 * sizeof(u_int),
+ M_TEMP, M_WAITOK);
+ *ap->a_ncookies = 0;
+ *ap->a_cookies = cookies;
+ }
return 0;
}
if (diff < n)