Source-Changes-HG archive

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

[src/trunk]: src/usr.sbin/makefs/msdos fix root detection (although the code ...



details:   https://anonhg.NetBSD.org/src/rev/2c07ff856a8d
branches:  trunk
changeset: 784406:2c07ff856a8d
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Jan 27 22:52:38 2013 +0000

description:
fix root detection (although the code is a noop)

diffstat:

 usr.sbin/makefs/msdos/msdosfs_denode.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r d0bf4a2c2e10 -r 2c07ff856a8d usr.sbin/makefs/msdos/msdosfs_denode.c
--- a/usr.sbin/makefs/msdos/msdosfs_denode.c    Sun Jan 27 22:52:19 2013 +0000
+++ b/usr.sbin/makefs/msdos/msdosfs_denode.c    Sun Jan 27 22:52:38 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msdosfs_denode.c,v 1.2 2013/01/26 16:50:46 christos Exp $      */
+/*     $NetBSD: msdosfs_denode.c,v 1.3 2013/01/27 22:52:38 christos Exp $      */
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -52,7 +52,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_denode.c,v 1.2 2013/01/26 16:50:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_denode.c,v 1.3 2013/01/27 22:52:38 christos Exp $");
 
 #include <sys/param.h>
 
@@ -215,7 +215,7 @@
         * recognize the root directory at this point in a file or
         * directory's life.
         */
-       if ((DETOV(dep) == (struct vnode *)-1) && !FAT32(pmp)) {
+       if (dep->de_vnode != NULL && !FAT32(pmp)) {
                printf("detrunc(): can't truncate root directory, clust %ld, offset %ld\n",
                    dep->de_dirclust, dep->de_diroffset);
                return (EINVAL);
@@ -323,7 +323,7 @@
        /*
         * The root of a DOS filesystem cannot be extended.
         */
-       if ((DETOV(dep) == (struct vnode *)-1) && !FAT32(pmp))
+       if (dep->de_vnode != NULL && !FAT32(pmp))
                return EINVAL;
 
        /*



Home | Main Index | Thread Index | Old Index