Module Name: src
Committed By: christos
Date: Tue Sep 27 01:25:33 UTC 2011
Modified Files:
src/sys/rump/librump/rumpvfs: rump_vfs_private.h rumpfs.c
Log Message:
define RUMPFS_MAXNAMLEN and use it.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/rump/librump/rumpvfs/rump_vfs_private.h
cvs rdiff -u -r1.99 -r1.100 src/sys/rump/librump/rumpvfs/rumpfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpvfs/rump_vfs_private.h
diff -u src/sys/rump/librump/rumpvfs/rump_vfs_private.h:1.14 src/sys/rump/librump/rumpvfs/rump_vfs_private.h:1.15
--- src/sys/rump/librump/rumpvfs/rump_vfs_private.h:1.14 Tue Sep 7 17:11:10 2010
+++ src/sys/rump/librump/rumpvfs/rump_vfs_private.h Mon Sep 26 21:25:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_vfs_private.h,v 1.14 2010/09/07 21:11:10 pooka Exp $ */
+/* $NetBSD: rump_vfs_private.h,v 1.15 2011/09/27 01:25:32 christos Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -57,6 +57,8 @@ void rump_vfs_drainbufs(int);
#include <sys/vnode.h>
#include <rump/rump.h>
+#define RUMPFS_MAXNAMLEN 255
+
#include "rumpvfs_if_priv.h"
#endif /* _SYS_RUMP_VFS_PRIVATE_H_ */
Index: src/sys/rump/librump/rumpvfs/rumpfs.c
diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.99 src/sys/rump/librump/rumpvfs/rumpfs.c:1.100
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.99 Tue Aug 23 03:40:32 2011
+++ src/sys/rump/librump/rumpvfs/rumpfs.c Mon Sep 26 21:25:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpfs.c,v 1.99 2011/08/23 07:40:32 hannken Exp $ */
+/* $NetBSD: rumpfs.c,v 1.100 2011/09/27 01:25:32 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.99 2011/08/23 07:40:32 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.100 2011/09/27 01:25:32 christos Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -229,7 +229,7 @@ static struct rumpfs_node *makeprivate(e
*/
struct etfs {
- char et_key[MAXPATHLEN];
+ char et_key[RUMPFS_MAXPATHLEN];
size_t et_keylen;
bool et_prefixkey;
bool et_removing;
@@ -1076,7 +1076,7 @@ rump_vop_symlink(void *v)
int rv;
linklen = strlen(target);
- KASSERT(linklen < MAXPATHLEN);
+ KASSERT(linklen < RUMPFS_MAXPATHLEN);
rn = makeprivate(VLNK, NODEV, linklen, false);
if ((cnp->cn_flags & ISWHITEOUT) != 0)
rn->rn_va.va_flags |= UF_OPAQUE;
@@ -1086,7 +1086,7 @@ rump_vop_symlink(void *v)
makedir(rnd, cnp, rn);
- KASSERT(linklen < MAXPATHLEN);
+ KASSERT(linklen < RUMPFS_MAXPATHLEN);
rn->rn_linktarg = PNBUF_GET();
rn->rn_linklen = linklen;
strcpy(rn->rn_linktarg, target);
@@ -1500,7 +1500,7 @@ rump_vop_pathconf(void *v)
*retval = 43; /* this one goes to 11 */
return 0;
case _PC_SYMLINK_MAX:
- *retval = MAXPATHLEN;
+ *retval = RUMPFS_MAXPATHLEN;
return 0;
case _PC_2_SYMLINKS:
*retval = 1;
