Module Name: src Committed By: christos Date: Tue Sep 27 01:05:09 UTC 2011
Modified Files: src/sys/nfs: nfs_srvsubs.c nfs_vnops.c Log Message: use NFS_MAXPATHLEN instead of MAXPATHLEN To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/nfs/nfs_srvsubs.c cvs rdiff -u -r1.291 -r1.292 src/sys/nfs/nfs_vnops.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/nfs/nfs_srvsubs.c diff -u src/sys/nfs/nfs_srvsubs.c:1.11 src/sys/nfs/nfs_srvsubs.c:1.12 --- src/sys/nfs/nfs_srvsubs.c:1.11 Mon Aug 8 12:04:07 2011 +++ src/sys/nfs/nfs_srvsubs.c Mon Sep 26 21:05:08 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: nfs_srvsubs.c,v 1.11 2011/08/08 16:04:07 dholland Exp $ */ +/* $NetBSD: nfs_srvsubs.c,v 1.12 2011/09/27 01:05:08 christos Exp $ */ /* * Copyright (c) 1989, 1993 @@ -70,7 +70,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nfs_srvsubs.c,v 1.11 2011/08/08 16:04:07 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nfs_srvsubs.c,v 1.12 2011/09/27 01:05:08 christos Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -129,7 +129,7 @@ nfs_namei(struct nameidata *ndp, nfsrvfh *retdirp = NULL; ndp->ni_pathbuf = NULL; - if ((len + 1) > MAXPATHLEN) + if ((len + 1) > NFS_MAXPATHLEN) return (ENAMETOOLONG); if (len == 0) return (EACCES); Index: src/sys/nfs/nfs_vnops.c diff -u src/sys/nfs/nfs_vnops.c:1.291 src/sys/nfs/nfs_vnops.c:1.292 --- src/sys/nfs/nfs_vnops.c:1.291 Sat Jun 11 23:35:59 2011 +++ src/sys/nfs/nfs_vnops.c Mon Sep 26 21:05:08 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: nfs_vnops.c,v 1.291 2011/06/12 03:35:59 rmind Exp $ */ +/* $NetBSD: nfs_vnops.c,v 1.292 2011/09/27 01:05:08 christos Exp $ */ /* * Copyright (c) 1989, 1993 @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.291 2011/06/12 03:35:59 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.292 2011/09/27 01:05:08 christos Exp $"); #ifdef _KERNEL_OPT #include "opt_nfs.h" @@ -1131,7 +1131,7 @@ nfs_readlinkrpc(struct vnode *vp, struct if (v3) { nfsm_dissect(tl, uint32_t *, NFSX_UNSIGNED); len = fxdr_unsigned(uint32_t, *tl); - if (len > MAXPATHLEN) { + if (len > NFS_MAXPATHLEN) { /* * this pathname is too long for us. */