mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2024-12-22 16:42:56 -08:00
Code
b0c10c99a4
openbsd-src/sys/nfs/nfs_var.h

203 lines
8.5 KiB
C
Raw Normal View History

move some server only functions from nfs_subs.c to nfs_srvsubs.c saves space on ramdisks that have option NFSCLIENT initial diff from and ok miod@
2024-09-08 20:50:14 -07:00
/* $OpenBSD: nfs_var.h,v 1.66 2024/09/09 03:50:14 jsg Exp $ */
From NetBSD: NFSv3 import (tomorrow's Net's kernel) Open's patches kept in. i'll possibly take a look at Lite2 soon, is there smth usefull ?..
1996-03-31 05:15:23 -08:00
/* $NetBSD: nfs_var.h,v 1.3 1996/02/18 11:53:54 fvdl Exp $ */
From NetBSD: merge with 960217 (still NFSv2)
1996-02-29 01:24:48 -08:00
/*
* Copyright (c) 1996 Christos Zoulas. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by Christos Zoulas.
* 4. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
From NetBSD: NFSv3 import (tomorrow's Net's kernel) Open's patches kept in. i'll possibly take a look at Lite2 soon, is there smth usefull ?..
1996-03-31 05:15:23 -08:00
/*
put the canonical ifdef dance for multiple inclusion, also put all the contents of this file inside #ifdef _KERNEL; there's nothing here that userland should ever need/touch. but then again, some userland programs define _KERNEL before they include kernel header files *shrugh*... survived a build, OK blambert@
2008-06-13 17:23:26 -07:00
* XXX needs <nfs/rpcv2.h> and <nfs/nfs.h> because of typedefs.
From NetBSD: NFSv3 import (tomorrow's Net's kernel) Open's patches kept in. i'll possibly take a look at Lite2 soon, is there smth usefull ?..
1996-03-31 05:15:23 -08:00
*/
put the canonical ifdef dance for multiple inclusion, also put all the contents of this file inside #ifdef _KERNEL; there's nothing here that userland should ever need/touch. but then again, some userland programs define _KERNEL before they include kernel header files *shrugh*... survived a build, OK blambert@
2008-06-13 17:23:26 -07:00
#ifndef _NFS_NFS_VAR_H_
#define _NFS_NFS_VAR_H_
#ifdef _KERNEL
From NetBSD: NFSv3 import (tomorrow's Net's kernel) Open's patches kept in. i'll possibly take a look at Lite2 soon, is there smth usefull ?..
1996-03-31 05:15:23 -08:00
From NetBSD: merge with 960217 (still NFSv2)
1996-02-29 01:24:48 -08:00
struct nfsnode;
struct sillyrename;
struct componentname;
put the canonical ifdef dance for multiple inclusion, also put all the contents of this file inside #ifdef _KERNEL; there's nothing here that userland should ever need/touch. but then again, some userland programs define _KERNEL before they include kernel header files *shrugh*... survived a build, OK blambert@
2008-06-13 17:23:26 -07:00
struct nfs_diskless;
group all of the on-stack variables that are uses by the nfsm_macros to keep the data munging "state" into an nfsm_info structure. Each function now has this structure on its stack, and it and its members are now passed around so that the macros/functions can work there magic. this will make removing the nfsm_* macros way easier. Idea/code picked up from DragonflyBSD. Tested by krw@, jacekm@ and myself. OK blambert@.
2009-08-04 10:12:39 -07:00
struct nfsm_info;
From NetBSD: merge with 960217 (still NFSv2)
1996-02-29 01:24:48 -08:00
/* nfs_bio.c */
First round of __P removal in sys
2002-03-13 17:26:25 -08:00
int nfs_bioread(struct vnode *, struct uio *, int, struct ucred *);
int nfs_write(void *);
o nfs_vinvalbuf() is always called with the intrflag as 1, and then checks if the mount is actually interrutable, and if not sets it 0. remove this argument from nfs_vinvalbuf and just do the checking inside the function. o give nfs_vinvalbuf() a makeover so it looks nice. (spacing, casts, &c); o Actually pass PCATCH too tsleep() if the mount it interrutable. ok art@, blambert@
2008-08-09 03:14:02 -07:00
int nfs_vinvalbuf(struct vnode *, int, struct ucred *, struct proc *);
Don't jump the queue if we have to wait on the client side because the nfs_bufq is full - instead tsleep waiting for one of our nfsiod's to free up space for us in the queue so we can enqueue on the end. ok blambert@, tedu@, oga@
2010-04-12 09:37:38 -07:00
int nfs_asyncio(struct buf *, int readahead);
First round of __P removal in sys
2002-03-13 17:26:25 -08:00
int nfs_doio(struct buf *, struct proc *);
From NetBSD: merge with 960217 (still NFSv2)
1996-02-29 01:24:48 -08:00
/* nfs_boot.c */
First round of __P removal in sys
2002-03-13 17:26:25 -08:00
int nfs_boot_init(struct nfs_diskless *, struct proc *);
From NetBSD: merge with 960217 (still NFSv2)
1996-02-29 01:24:48 -08:00
/* nfs_node.c */
replace the use of RB macros with the RBT functions.
2016-09-26 18:37:38 -07:00
void nfs_ninit(struct nfsmount *);
First round of __P removal in sys
2002-03-13 17:26:25 -08:00
int nfs_nget(struct mount *, nfsfh_t *, int, struct nfsnode **);
int nfs_inactive(void *);
int nfs_reclaim(void *);
From NetBSD: merge with 960217 (still NFSv2)
1996-02-29 01:24:48 -08:00
/* nfs_vnops.c */
First round of __P removal in sys
2002-03-13 17:26:25 -08:00
int nfs_readlink(void *);
int nfs_readlinkrpc(struct vnode *, struct uio *, struct ucred *);
int nfs_readrpc(struct vnode *, struct uio *);
int nfs_writerpc(struct vnode *, struct uio *, int *, int *);
int nfs_removeit(struct sillyrename *);
int nfs_writebp(struct buf *, int);
remove a whole bunch of duplicate function prototypes. (survived build/release on macppc/amd64). ok pedro@
2007-06-21 15:59:49 -07:00
#define nfs_ioctl ((int (*)(void *))enoioctl)
From NetBSD: merge with 960217 (still NFSv2)
1996-02-29 01:24:48 -08:00
/* nfs_serv.c */
First round of __P removal in sys
2002-03-13 17:26:25 -08:00
int nfsrv3_access(struct nfsrv_descript *, struct nfssvc_sock *,
struct proc *, struct mbuf **);
int nfsrv_getattr(struct nfsrv_descript *, struct nfssvc_sock *,
struct proc *, struct mbuf **);
int nfsrv_setattr(struct nfsrv_descript *, struct nfssvc_sock *,
struct proc *, struct mbuf **);
int nfsrv_lookup(struct nfsrv_descript *, struct nfssvc_sock *,
struct proc *, struct mbuf **);
int nfsrv_readlink(struct nfsrv_descript *, struct nfssvc_sock *,
struct proc *, struct mbuf **);
int nfsrv_read(struct nfsrv_descript *, struct nfssvc_sock *,
struct proc *, struct mbuf **);
int nfsrv_write(struct nfsrv_descript *, struct nfssvc_sock *,
struct proc *, struct mbuf **);
int nfsrv_create(struct nfsrv_descript *, struct nfssvc_sock *,
struct proc *, struct mbuf **);
int nfsrv_mknod(struct nfsrv_descript *, struct nfssvc_sock *,
struct proc *, struct mbuf **);
int nfsrv_remove(struct nfsrv_descript *, struct nfssvc_sock *,
struct proc *, struct mbuf **);
int nfsrv_rename(struct nfsrv_descript *, struct nfssvc_sock *,
struct proc *, struct mbuf **);
int nfsrv_link(struct nfsrv_descript *, struct nfssvc_sock *,
struct proc *, struct mbuf **);
int nfsrv_symlink(struct nfsrv_descript *, struct nfssvc_sock *,
struct proc *, struct mbuf **);
int nfsrv_mkdir(struct nfsrv_descript *, struct nfssvc_sock *,
struct proc *, struct mbuf **);
int nfsrv_rmdir(struct nfsrv_descript *, struct nfssvc_sock *,
struct proc *, struct mbuf **);
int nfsrv_readdir(struct nfsrv_descript *, struct nfssvc_sock *,
struct proc *, struct mbuf **);
int nfsrv_readdirplus(struct nfsrv_descript *, struct nfssvc_sock *,
struct proc *, struct mbuf **);
int nfsrv_commit(struct nfsrv_descript *, struct nfssvc_sock *,
struct proc *, struct mbuf **);
int nfsrv_statfs(struct nfsrv_descript *, struct nfssvc_sock *,
struct proc *, struct mbuf **);
int nfsrv_fsinfo(struct nfsrv_descript *, struct nfssvc_sock *,
struct proc *, struct mbuf **);
int nfsrv_pathconf(struct nfsrv_descript *, struct nfssvc_sock *,
struct proc *, struct mbuf **);
int nfsrv_null(struct nfsrv_descript *, struct nfssvc_sock *,
struct proc *, struct mbuf **);
int nfsrv_noop(struct nfsrv_descript *, struct nfssvc_sock *,
struct proc *, struct mbuf **);
From NetBSD: merge with 960217 (still NFSv2)
1996-02-29 01:24:48 -08:00
/* nfs_socket.c */
First round of __P removal in sys
2002-03-13 17:26:25 -08:00
int nfs_connect(struct nfsmount *, struct nfsreq *);
void nfs_disconnect(struct nfsmount *);
int nfs_send(struct socket *, struct mbuf *, struct mbuf *,
struct nfsreq *);
group all of the on-stack variables that are uses by the nfsm_macros to keep the data munging "state" into an nfsm_info structure. Each function now has this structure on its stack, and it and its members are now passed around so that the macros/functions can work there magic. this will make removing the nfsm_* macros way easier. Idea/code picked up from DragonflyBSD. Tested by krw@, jacekm@ and myself. OK blambert@.
2009-08-04 10:12:39 -07:00
int nfs_request(struct vnode *, int, struct nfsm_info *);
Remove unused function parameter 'cache' from nfs_rephead ok costa@
2002-07-03 13:57:00 -07:00
int nfs_rephead(int, struct nfsrv_descript *, struct nfssvc_sock *, int,
Remove now-vestigial bpos pointer from NFS. For building outgoing NFS mbufs, mbufs now contain all their internal buffer state internally, the way god intended. ok thib@ testing johan@ (and possibly merdely@; this diff's been around for a bit...)
2008-06-12 13:24:06 -07:00
struct mbuf **, struct mbuf **);
First round of __P removal in sys
2002-03-13 17:26:25 -08:00
void nfs_timer(void *);
int nfs_sigintr(struct nfsmount *, struct nfsreq *, struct proc *);
int nfs_sndlock(int *, struct nfsreq *);
void nfs_sndunlock(int *);
void nfsrv_rcv(struct socket *, caddr_t, int);
int nfsrv_dorec(struct nfssvc_sock *, struct nfsd *,
struct nfsrv_descript **);
void nfsrv_wakenfsd(struct nfssvc_sock *);
From NetBSD: merge with 960217 (still NFSv2)
1996-02-29 01:24:48 -08:00
/* nfs_srvcache.c */
First round of __P removal in sys
2002-03-13 17:26:25 -08:00
void nfsrv_initcache(void );
int nfsrv_getcache(struct nfsrv_descript *, struct nfssvc_sock *,
struct mbuf **);
void nfsrv_updatecache(struct nfsrv_descript *, int, struct mbuf *);
void nfsrv_cleancache(void);
From NetBSD: merge with 960217 (still NFSv2)
1996-02-29 01:24:48 -08:00
move some server only functions from nfs_subs.c to nfs_srvsubs.c saves space on ramdisks that have option NFSCLIENT initial diff from and ok miod@
2024-09-08 20:50:14 -07:00
/* nfs_srvsubs.c */
int nfs_namei(struct nameidata *, fhandle_t *, int, struct nfssvc_sock *,
struct mbuf *, struct mbuf **, caddr_t *, struct vnode **,
struct proc *);
void nfsm_adj(struct mbuf *, int, int);
void nfsm_srvwcc(struct nfsrv_descript *, int, struct vattr *, int,
struct vattr *, struct nfsm_info *);
void nfsm_srvpostop_attr(struct nfsrv_descript *, int, struct vattr *,
struct nfsm_info *);
void nfsm_srvfattr(struct nfsrv_descript *, struct vattr *,
struct nfs_fattr *);
int nfsrv_fhtovp(fhandle_t *, int, struct vnode **, struct ucred *,
struct nfssvc_sock *, struct mbuf *, int *);
int netaddr_match(int, union nethostaddr *, struct mbuf *);
int nfsm_srvsattr(struct mbuf **, struct vattr *, struct mbuf *, caddr_t *);
From NetBSD: merge with 960217 (still NFSv2)
1996-02-29 01:24:48 -08:00
/* nfs_subs.c */
Kill one-liner macro which obfuscated mbuf pointer assignment. Rescue nfsm_reqhead macro name and rename nfsm_reqh. End of one-liners from nfsm_subs.h. ok thib@
2008-06-13 15:11:32 -07:00
struct mbuf *nfsm_reqhead(int);
Start reworking NFS client mbuf handling by creating an interface which requires well-formed mbuf chains to work. Existing function name is now a wrapper to this interface. Much, much more work to follow which will build on this. Truly change we can believe in. ok thib@, who would have preferred this in two commits, but I'm impatient :) testing on multiple arches (i386, arm, amd64, and sparc64 at least) by many, thanks to all who did so
2009-01-20 10:03:33 -08:00
void nfsm_rpchead(struct nfsreq *, struct ucred *, int);
Remove now-vestigial bpos pointer from NFS. For building outgoing NFS mbufs, mbufs now contain all their internal buffer state internally, the way god intended. ok thib@ testing johan@ (and possibly merdely@; this diff's been around for a bit...)
2008-06-12 13:24:06 -07:00
void *nfsm_build(struct mbuf **, u_int);
First round of __P removal in sys
2002-03-13 17:26:25 -08:00
int nfsm_mbuftouio(struct mbuf **, struct uio *, int, caddr_t *);
Remove now-vestigial bpos pointer from NFS. For building outgoing NFS mbufs, mbufs now contain all their internal buffer state internally, the way god intended. ok thib@ testing johan@ (and possibly merdely@; this diff's been around for a bit...)
2008-06-12 13:24:06 -07:00
void nfsm_uiotombuf(struct mbuf **, struct uio *, size_t);
void nfsm_strtombuf(struct mbuf **, void *, size_t);
void nfsm_buftombuf(struct mbuf **, void *, size_t);
First round of __P removal in sys
2002-03-13 17:26:25 -08:00
int nfs_adv(struct mbuf **, caddr_t *, int, int);
int nfs_vfs_init(struct vfsconf *);
o Avoid putting duplicate entries into the name cache, add a function to handle cache_enter()'s for us since we need to update the appropriate timestamps so we don't miss on lookup; o Do not purge the dvp in nfs_rmdir(), since there's no need; o cache the new entry created in nfs_mkdir(); o Do caching of the access modes, this drastically reduces the amount of over the wire access RPCs we do in the NFSv3 case. This diff was written by Pedro Martelletto, sometime in 2004. A lot of people have been running with it at one time or another, this includes at least markus and matthieu. OK deraadt@, blambert@
2008-06-10 15:59:09 -07:00
int nfs_attrtimeo(struct nfsnode *);
First round of __P removal in sys
2002-03-13 17:26:25 -08:00
int nfs_loadattrcache(struct vnode **, struct mbuf **, caddr_t *,
struct vattr *);
int nfs_getattrcache(struct vnode *, struct vattr *);
Remove now-vestigial bpos pointer from NFS. For building outgoing NFS mbufs, mbufs now contain all their internal buffer state internally, the way god intended. ok thib@ testing johan@ (and possibly merdely@; this diff's been around for a bit...)
2008-06-12 13:24:06 -07:00
void nfsm_v3attrbuild(struct mbuf **, struct vattr *, int);
Convert all the NFS macros (in nfsm_subs.h) into inline functions with the appropriate extra arguments. This (hopefully) completes the unmessyfication work started by thib@ a long, long time ago (in a galaxy far away). The conversion logic has been: - nfsm_dissect has been turned into an rvalue expression, leaving the cast operation up to its caller. - macros which had three different exit paths (return, goto nfsmout or fallthrough) have been split so that no macros have more than two exit paths. - then they have been modified to return a value, which lets the caller figure out what exit path is needed. - local variables abused by the macros are now local variables of the new inline functions. This single commit is the sum of 25 intermediate diffs, which have all been carefully reviewed by (at least) jsg@ and semarie@. Tested with v2 and v3 servers and clients. ok jsg@ semarie@
2024-04-30 10:04:23 -07:00
int nfsm_disct(struct mbuf **, caddr_t *, int, int, caddr_t *);
First round of __P removal in sys
2002-03-13 17:26:25 -08:00
void nfs_clearcommit(struct mount *);
NFS commit coalescion: instead of sending a commit for each block, coalesce these into larger ranges wherever possible. this should speed up NFS writes quite a bit. ok art@ millert@ pedro@ tedu@
2004-08-03 10:11:48 -07:00
int nfs_in_committed_range(struct vnode *, struct buf *);
int nfs_in_tobecommitted_range(struct vnode *, struct buf *);
void nfs_add_committed_range(struct vnode *, struct buf *);
void nfs_del_committed_range(struct vnode *, struct buf *);
void nfs_add_tobecommitted_range(struct vnode *, struct buf *);
void nfs_del_tobecommitted_range(struct vnode *, struct buf *);
void nfs_merge_commit_ranges(struct vnode *);
First round of __P removal in sys
2002-03-13 17:26:25 -08:00
int nfsrv_errmap(struct nfsrv_descript *, int);
Teach nfsm_fhtom about nfsm_info structs ok thib@
2009-08-13 08:18:16 -07:00
void nfsm_fhtom(struct nfsm_info *, struct vnode *, int);
Convert macros to functions to reduce kernel memory usage. In snaps for a while (way too long, according to deraadt@)
2009-04-13 10:51:57 -07:00
void nfsm_srvfhtom(struct mbuf **, fhandle_t *, int);
From NetBSD: merge with 960217 (still NFSv2)
1996-02-29 01:24:48 -08:00
/* nfs_syscalls.c */
First round of __P removal in sys
2002-03-13 17:26:25 -08:00
int sys_nfssvc(struct proc *, void *, register_t *);
void nfsrv_init(int);
Backout the asyncio/aiod change, as it causes buf's to get hung. problem noticed by deraadt@ ok beck@
2009-09-02 11:20:54 -07:00
void nfs_getset_niothreads(int);
kqueue support for NFS, adapted from netbsd. ok art@ pedro@, "get it in" deraadt@
2004-07-21 10:30:55 -07:00
/* nfs_kq.c */
int nfs_kqfilter(void *);
Rework NFS mbuf write routines: nfsm_uiotombuf(): - no meaningful return, function becomes void - replace frankensteined uiomove/MGET with actual call to uiomove nfsm_strtmbuf(): - no meaningful return, becomes void - rename and reorder parameters to be consistent with other functions - becomes wrapper to nfsm_uiotombuf nfsm_buftombuf(): - new function; unused but slated for future use - wrapper to nfsm_uiotombuf As a bonus, making these functions void removes much unneeded code and garbage collects `magic' variable t2 which was only used (invisibly) by the macros from nfsm_subs.h Preps the way for removing much more NFS goo... testing by myself, thib@ and merdely@ ok thib@
2008-04-14 06:46:13 -07:00
/* Internal NFS utility macros */
#define mb_offset(m) (mtod((m), caddr_t) + (m)->m_len)
#define nfsm_padlen(s) (nfsm_rndup(s) - (s))
put the canonical ifdef dance for multiple inclusion, also put all the contents of this file inside #ifdef _KERNEL; there's nothing here that userland should ever need/touch. but then again, some userland programs define _KERNEL before they include kernel header files *shrugh*... survived a build, OK blambert@
2008-06-13 17:23:26 -07:00
#endif /* _KERNEL */
#endif /* _NFS_NFS_VAR_H_ */
Copy Permalink