Module Name: src
Committed By: bouyer
Date: Tue Oct 27 20:37:39 UTC 2009
Modified Files:
src/distrib/sets/lists/base [netbsd-5]: md.amd64 md.sparc64 shl.mi
src/lib/libpuffs [netbsd-5]: puffs.c puffs.h shlib_version
Log Message:
Pull up following revision(s) (requested by pooka in ticket #1105):
lib/libpuffs/puffs.h: revision 1.112
lib/libpuffs/puffs.c: revision 1.100
distrib/sets/lists/base/md.amd64: patch
distrib/sets/lists/base/md.sparc64: patch
distrib/sets/lists/base/shl.mi: patch
lib/libpuffs/shlib_version: patch
Make it possible to supply parameters to puffs_init() later (but
before puffs_mount()).
To generate a diff of this commit:
cvs rdiff -u -r1.25.2.4 -r1.25.2.5 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.23.2.4 -r1.23.2.5 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.450.2.3 -r1.450.2.4 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.92.4.3 -r1.92.4.4 src/lib/libpuffs/puffs.c
cvs rdiff -u -r1.108.4.3 -r1.108.4.4 src/lib/libpuffs/puffs.h
cvs rdiff -u -r1.1 -r1.1.24.1 src/lib/libpuffs/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.25.2.4 src/distrib/sets/lists/base/md.amd64:1.25.2.5
--- src/distrib/sets/lists/base/md.amd64:1.25.2.4 Tue Aug 4 18:32:07 2009
+++ src/distrib/sets/lists/base/md.amd64 Tue Oct 27 20:37:38 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.25.2.4 2009/08/04 18:32:07 snj Exp $
+# $NetBSD: md.amd64,v 1.25.2.5 2009/10/27 20:37:38 bouyer Exp $
./@MODULEDIR@/adosfs base-kernel-modules
./@MODULEDIR@/adosfs/adosfs.kmod base-kernel-modules
./@MODULEDIR@/azalia base-kernel-modules
@@ -219,7 +219,7 @@
./usr/lib/i386/libpthread_dbg.so.1 base-compat-shlib compat,pic
./usr/lib/i386/libpthread_dbg.so.1.0 base-compat-shlib compat,pic
./usr/lib/i386/libpuffs.so.0 base-compat-shlib compat,pic
-./usr/lib/i386/libpuffs.so.0.0 base-compat-shlib compat,pic
+./usr/lib/i386/libpuffs.so.0.1 base-compat-shlib compat,pic
./usr/lib/i386/libradius.so.2 base-compat-shlib compat,pic
./usr/lib/i386/libradius.so.2.0 base-compat-shlib compat,pic
./usr/lib/i386/libresolv.so.1 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/md.sparc64
diff -u src/distrib/sets/lists/base/md.sparc64:1.23.2.4 src/distrib/sets/lists/base/md.sparc64:1.23.2.5
--- src/distrib/sets/lists/base/md.sparc64:1.23.2.4 Tue Aug 4 18:32:08 2009
+++ src/distrib/sets/lists/base/md.sparc64 Tue Oct 27 20:37:38 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.23.2.4 2009/08/04 18:32:08 snj Exp $
+# $NetBSD: md.sparc64,v 1.23.2.5 2009/10/27 20:37:38 bouyer Exp $
./sbin/edlabel base-sysutil-root
./usr/bin/fdformat base-util-bin
./usr/lib/sparc base-compat-lib compat
@@ -154,7 +154,7 @@
./usr/lib/sparc/libpthread_dbg.so.1 base-compat-shlib compat,pic
./usr/lib/sparc/libpthread_dbg.so.1.0 base-compat-shlib compat,pic
./usr/lib/sparc/libpuffs.so.0 base-compat-shlib compat,pic
-./usr/lib/sparc/libpuffs.so.0.0 base-compat-shlib compat,pic
+./usr/lib/sparc/libpuffs.so.0.1 base-compat-shlib compat,pic
./usr/lib/sparc/libradius.so.2 base-compat-shlib compat,pic
./usr/lib/sparc/libradius.so.2.0 base-compat-shlib compat,pic
./usr/lib/sparc/libresolv.so.1 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.450.2.3 src/distrib/sets/lists/base/shl.mi:1.450.2.4
--- src/distrib/sets/lists/base/shl.mi:1.450.2.3 Tue Aug 4 18:32:08 2009
+++ src/distrib/sets/lists/base/shl.mi Tue Oct 27 20:37:38 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.450.2.3 2009/08/04 18:32:08 snj Exp $
+# $NetBSD: shl.mi,v 1.450.2.4 2009/10/27 20:37:38 bouyer Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -105,7 +105,7 @@
./usr/lib/libprop.so.0.7 base-sys-shlib
./usr/lib/libpthread.so.0.10 base-sys-shlib
./usr/lib/libpthread_dbg.so.1.0 base-sys-shlib
-./usr/lib/libpuffs.so.0.0 base-sys-shlib
+./usr/lib/libpuffs.so.0.1 base-sys-shlib
./usr/lib/libradius.so.2.0 base-net-shlib
./usr/lib/librefuse.so.0.0 base-sys-shlib
./usr/lib/libresolv.so.1.1 base-net-shlib
Index: src/lib/libpuffs/puffs.c
diff -u src/lib/libpuffs/puffs.c:1.92.4.3 src/lib/libpuffs/puffs.c:1.92.4.4
--- src/lib/libpuffs/puffs.c:1.92.4.3 Sun Oct 18 12:46:07 2009
+++ src/lib/libpuffs/puffs.c Tue Oct 27 20:37:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs.c,v 1.92.4.3 2009/10/18 12:46:07 sborrill Exp $ */
+/* $NetBSD: puffs.c,v 1.92.4.4 2009/10/27 20:37:38 bouyer Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: puffs.c,v 1.92.4.3 2009/10/18 12:46:07 sborrill Exp $");
+__RCSID("$NetBSD: puffs.c,v 1.92.4.4 2009/10/27 20:37:38 bouyer Exp $");
#endif /* !lint */
#include <sys/param.h>
@@ -276,6 +276,18 @@
pu->pu_privdata = privdata;
}
+void
+puffs_setmntinfo(struct puffs_usermount *pu,
+ const char *mntfromname, const char *puffsname)
+{
+ struct puffs_kargs *pargs = pu->pu_kargp;
+
+ (void)strlcpy(pargs->pa_mntfromname, mntfromname,
+ sizeof(pargs->pa_mntfromname));
+ (void)strlcpy(pargs->pa_typename, puffsname,
+ sizeof(pargs->pa_typename));
+}
+
size_t
puffs_getmaxreqlen(struct puffs_usermount *pu)
{
@@ -594,6 +606,13 @@
struct puffs_kargs *pargs;
int sverrno;
+ if (puffsname == PUFFS_DEFER)
+ puffsname = "n/a";
+ if (mntfromname == PUFFS_DEFER)
+ mntfromname = "n/a";
+ if (priv == PUFFS_DEFER)
+ priv = NULL;
+
pu = malloc(sizeof(struct puffs_usermount));
if (pu == NULL)
goto failfree;
@@ -607,10 +626,7 @@
pargs->pa_vers = PUFFSDEVELVERS | PUFFSVERSION;
pargs->pa_flags = PUFFS_FLAG_KERN(pflags);
fillvnopmask(pops, pargs->pa_vnopmask);
- (void)strlcpy(pargs->pa_typename, puffsname,
- sizeof(pargs->pa_typename));
- (void)strlcpy(pargs->pa_mntfromname, mntfromname,
- sizeof(pargs->pa_mntfromname));
+ puffs_setmntinfo(pu, mntfromname, puffsname);
puffs_zerostatvfs(&pargs->pa_svfsb);
pargs->pa_root_cookie = NULL;
Index: src/lib/libpuffs/puffs.h
diff -u src/lib/libpuffs/puffs.h:1.108.4.3 src/lib/libpuffs/puffs.h:1.108.4.4
--- src/lib/libpuffs/puffs.h:1.108.4.3 Sun Oct 18 12:46:07 2009
+++ src/lib/libpuffs/puffs.h Tue Oct 27 20:37:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs.h,v 1.108.4.3 2009/10/18 12:46:07 sborrill Exp $ */
+/* $NetBSD: puffs.h,v 1.108.4.4 2009/10/27 20:37:38 bouyer Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -418,6 +418,7 @@
__BEGIN_DECLS
+#define PUFFS_DEFER ((void *)-1)
struct puffs_usermount *_puffs_init(int, struct puffs_ops *, const char *,
const char *, void *, uint32_t);
int puffs_mount(struct puffs_usermount *, const char *, int, void*);
@@ -446,6 +447,8 @@
void puffs_setmaxreqlen(struct puffs_usermount *, size_t);
size_t puffs_getmaxreqlen(struct puffs_usermount *);
void puffs_setfhsize(struct puffs_usermount *, size_t, int);
+void puffs_setmntinfo(struct puffs_usermount *,
+ const char *, const char *);
void puffs_setncookiehash(struct puffs_usermount *, int);
Index: src/lib/libpuffs/shlib_version
diff -u src/lib/libpuffs/shlib_version:1.1 src/lib/libpuffs/shlib_version:1.1.24.1
--- src/lib/libpuffs/shlib_version:1.1 Sun Oct 22 22:52:21 2006
+++ src/lib/libpuffs/shlib_version Tue Oct 27 20:37:38 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shlib_version,v 1.1 2006/10/22 22:52:21 pooka Exp $
+# $NetBSD: shlib_version,v 1.1.24.1 2009/10/27 20:37:38 bouyer Exp $
#
major=0
-minor=0
+minor=1
