Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-6]: src/sys/fs/tmpfs Pull up following revision(s) (requested by ...



details:   https://anonhg.NetBSD.org/src/rev/a1cb96a36534
branches:  netbsd-6
changeset: 773842:a1cb96a36534
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Feb 27 20:25:33 2012 +0000

description:
Pull up following revision(s) (requested by chs in ticket #58):
        sys/fs/tmpfs/tmpfs_vnops.c: revision 1.95
in tmpfs_readdir(), skip the . and .. processing on removed directories,
since the latter will crash in this case.

diffstat:

 sys/fs/tmpfs/tmpfs_vnops.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r 96b7680d8f67 -r a1cb96a36534 sys/fs/tmpfs/tmpfs_vnops.c
--- a/sys/fs/tmpfs/tmpfs_vnops.c        Mon Feb 27 20:22:59 2012 +0000
+++ b/sys/fs/tmpfs/tmpfs_vnops.c        Mon Feb 27 20:25:33 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tmpfs_vnops.c,v 1.94 2012/01/22 03:13:19 rmind Exp $   */
+/*     $NetBSD: tmpfs_vnops.c,v 1.94.2.1 2012/02/27 20:25:33 riz Exp $ */
 
 /*
  * Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.94 2012/01/22 03:13:19 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.94.2.1 2012/02/27 20:25:33 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/dirent.h>
@@ -2206,6 +2206,10 @@
        node = VP_TO_TMPFS_DIR(vp);
        startoff = uio->uio_offset;
        cnt = 0;
+       if (node->tn_links == 0) {
+               error = 0;
+               goto out;
+       }
 
        if (uio->uio_offset == TMPFS_DIRCOOKIE_DOT) {
                error = tmpfs_dir_getdotdent(node, uio);



Home | Main Index | Thread Index | Old Index