[src/trunk]: src/sys/rump/librump/rumpvfs fix confusion between MAXPATHLEN an...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c7376444486b
branches:  trunk
changeset: 769951:c7376444486b
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Sep 27 13:53:26 2011 +0000

description:
fix confusion between MAXPATHLEN and MAXNAMLEN

diffstat:

 sys/rump/librump/rumpvfs/rumpfs.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 722fc76031fe -r c7376444486b sys/rump/librump/rumpvfs/rumpfs.c
--- a/sys/rump/librump/rumpvfs/rumpfs.c Tue Sep 27 11:24:20 2011 +0000
+++ b/sys/rump/librump/rumpvfs/rumpfs.c Tue Sep 27 13:53:26 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rumpfs.c,v 1.101 2011/09/27 01:45:04 christos Exp $    */
+/*     $NetBSD: rumpfs.c,v 1.102 2011/09/27 13:53:26 christos Exp $    */
 
 /*
  * Copyright (c) 2009, 2010, 2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.101 2011/09/27 01:45:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.102 2011/09/27 13:53:26 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -229,7 +229,7 @@
  */
 
 struct etfs {
-       char et_key[RUMPFS_MAXPATHLEN];
+       char et_key[MAXPATHLEN];
        size_t et_keylen;
        bool et_prefixkey;
        bool et_removing;
@@ -1076,7 +1076,7 @@
        int rv;
 
        linklen = strlen(target);
-       KASSERT(linklen < RUMPFS_MAXPATHLEN);
+       KASSERT(linklen < MAXPATHLEN);
        rn = makeprivate(VLNK, NODEV, linklen, false);
        if ((cnp->cn_flags & ISWHITEOUT) != 0)
                rn->rn_va.va_flags |= UF_OPAQUE;
@@ -1086,7 +1086,7 @@
 
        makedir(rnd, cnp, rn);
 
-       KASSERT(linklen < RUMPFS_MAXPATHLEN);
+       KASSERT(linklen < MAXPATHLEN);
        rn->rn_linktarg = PNBUF_GET();
        rn->rn_linklen = linklen;
        strcpy(rn->rn_linktarg, target);
@@ -1500,7 +1500,7 @@
                *retval = 43; /* this one goes to 11 */
                return 0;
        case _PC_SYMLINK_MAX:
-               *retval = RUMPFS_MAXPATHLEN;
+               *retval =_MAXPATHLEN;
                return 0;
        case _PC_2_SYMLINKS:
                *retval = 1;