Module Name: src
Committed By: pho
Date: Fri Dec 3 14:00:59 UTC 2021
Modified Files:
src/lib/libpuffs: puffs.3 puffs.c puffs.h puffs_ops.3
Log Message:
Avoid using register_t or vsize_t in <puffs.h>
<puffs.h> is a user-space header, and should not use any of
kernel-only types. It's not reasonable to require user-land
filesystems to #define _KERNTYPES.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/lib/libpuffs/puffs.3
cvs rdiff -u -r1.125 -r1.126 src/lib/libpuffs/puffs.c
cvs rdiff -u -r1.128 -r1.129 src/lib/libpuffs/puffs.h
cvs rdiff -u -r1.47 -r1.48 src/lib/libpuffs/puffs_ops.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpuffs/puffs.3
diff -u src/lib/libpuffs/puffs.3:1.64 src/lib/libpuffs/puffs.3:1.65
--- src/lib/libpuffs/puffs.3:1.64 Fri Dec 27 10:13:59 2019
+++ src/lib/libpuffs/puffs.3 Fri Dec 3 14:00:59 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: puffs.3,v 1.64 2019/12/27 10:13:59 msaitoh Exp $
+.\" $NetBSD: puffs.3,v 1.65 2021/12/03 14:00:59 pho Exp $
.\"
.\" Copyright (c) 2006, 2007, 2008 Antti Kantee. All rights reserved.
.\"
@@ -55,7 +55,7 @@
.Fn puffs_setroot "struct puffs_usermount *pu" "struct puffs_node *node"
.Ft void
.Fo puffs_setrootinfo
-.Fa "struct puffs_usermount *pu" "enum vtype vt" "vsize_t vsize" "dev_t rdev"
+.Fa "struct puffs_usermount *pu" "enum vtype vt" "voff_t vsize" "dev_t rdev"
.Fc
.Ft struct puffs_node *
.Fn puffs_getroot "struct puffs_usermount *pu"
Index: src/lib/libpuffs/puffs.c
diff -u src/lib/libpuffs/puffs.c:1.125 src/lib/libpuffs/puffs.c:1.126
--- src/lib/libpuffs/puffs.c:1.125 Sat Oct 30 10:34:18 2021
+++ src/lib/libpuffs/puffs.c Fri Dec 3 14:00:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs.c,v 1.125 2021/10/30 10:34:18 nia Exp $ */
+/* $NetBSD: puffs.c,v 1.126 2021/12/03 14:00:59 pho 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.125 2021/10/30 10:34:18 nia Exp $");
+__RCSID("$NetBSD: puffs.c,v 1.126 2021/12/03 14:00:59 pho Exp $");
#endif /* !lint */
#include <sys/param.h>
@@ -265,7 +265,7 @@ puffs_getroot(struct puffs_usermount *pu
void
puffs_setrootinfo(struct puffs_usermount *pu, enum vtype vt,
- vsize_t vsize, dev_t rdev)
+ voff_t vsize, dev_t rdev)
{
struct puffs_kargs *pargs = pu->pu_kargp;
Index: src/lib/libpuffs/puffs.h
diff -u src/lib/libpuffs/puffs.h:1.128 src/lib/libpuffs/puffs.h:1.129
--- src/lib/libpuffs/puffs.h:1.128 Mon Sep 23 12:00:57 2019
+++ src/lib/libpuffs/puffs.h Fri Dec 3 14:00:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs.h,v 1.128 2019/09/23 12:00:57 christos Exp $ */
+/* $NetBSD: puffs.h,v 1.129 2021/12/03 14:00:59 pho Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -223,7 +223,7 @@ struct puffs_ops {
int (*puffs_node_inactive)(struct puffs_usermount *, puffs_cookie_t);
int (*puffs_node_print)(struct puffs_usermount *, puffs_cookie_t);
int (*puffs_node_pathconf)(struct puffs_usermount *,
- puffs_cookie_t, int, register_t *);
+ puffs_cookie_t, int, __register_t *);
int (*puffs_node_advlock)(struct puffs_usermount *,
puffs_cookie_t, void *, int, struct flock *, int);
int (*puffs_node_read)(struct puffs_usermount *, puffs_cookie_t,
@@ -385,7 +385,7 @@ enum {
int fsname##_node_print(struct puffs_usermount *, \
puffs_cookie_t); \
int fsname##_node_pathconf(struct puffs_usermount *, \
- puffs_cookie_t, int, register_t *); \
+ puffs_cookie_t, int, __register_t *); \
int fsname##_node_advlock(struct puffs_usermount *, \
puffs_cookie_t, void *, int, struct flock *, int); \
int fsname##_node_read(struct puffs_usermount *, puffs_cookie_t,\
@@ -503,7 +503,7 @@ void puffs_setroot(struct puffs_usermo
struct puffs_node *);
struct puffs_node *puffs_getroot(struct puffs_usermount *);
void puffs_setrootinfo(struct puffs_usermount *,
- enum vtype, vsize_t, dev_t);
+ enum vtype, voff_t, dev_t);
void *puffs_getspecific(struct puffs_usermount *);
void puffs_setspecific(struct puffs_usermount *, void *);
Index: src/lib/libpuffs/puffs_ops.3
diff -u src/lib/libpuffs/puffs_ops.3:1.47 src/lib/libpuffs/puffs_ops.3:1.48
--- src/lib/libpuffs/puffs_ops.3:1.47 Wed Aug 4 09:31:25 2021
+++ src/lib/libpuffs/puffs_ops.3 Fri Dec 3 14:00:59 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: puffs_ops.3,v 1.47 2021/08/04 09:31:25 andvar Exp $
+.\" $NetBSD: puffs_ops.3,v 1.48 2021/12/03 14:00:59 pho Exp $
.\"
.\" Copyright (c) 2007 Antti Kantee. All rights reserved.
.\"
@@ -120,7 +120,7 @@
.Ft int
.Fo puffs_node_pathconf
.Fa "struct puffs_usermount *pu" "puffs_cookie_t opc" "int name"
-.Fa "register_t *retval"
+.Fa "__register_t *retval"
.Fc
.Ft int
.Fo puffs_node_advlock
