CVS commit: src/sys/fs/nfs/client
Module Name:src Committed By: pgoyette Date: Tue Dec 13 22:54:24 UTC 2016 Modified Files: src/sys/fs/nfs/client: nfs.h Log Message: More changes for creds, mutex, etc. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/fs/nfs/client/nfs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/fs/nfs/client/nfs.h diff -u src/sys/fs/nfs/client/nfs.h:1.1.1.2 src/sys/fs/nfs/client/nfs.h:1.2 --- src/sys/fs/nfs/client/nfs.h:1.1.1.2 Fri Nov 18 07:49:11 2016 +++ src/sys/fs/nfs/client/nfs.h Tue Dec 13 22:54:24 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: nfs.h,v 1.1.1.2 2016/11/18 07:49:11 pgoyette Exp $ */ +/* $NetBSD: nfs.h,v 1.2 2016/12/13 22:54:24 pgoyette Exp $ */ /*- * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * FreeBSD: head/sys/fs/nfsclient/nfs.h 276140 2014-12-23 14:24:36Z rmacklem - * $NetBSD: nfs.h,v 1.1.1.2 2016/11/18 07:49:11 pgoyette Exp $ + * $NetBSD: nfs.h,v 1.2 2016/12/13 22:54:24 pgoyette Exp $ */ #ifndef _NFSCLIENT_NFS_H_ @@ -91,34 +91,35 @@ enum nfsiod_state { /* * Function prototypes. */ -int ncl_meta_setsize(struct vnode *, struct ucred *, struct thread *, +int ncl_meta_setsize(struct vnode *, struct kauth_cred *, struct lwp *, u_quad_t); void ncl_doio_directwrite(struct buf *); -int ncl_bioread(struct vnode *, struct uio *, int, struct ucred *); -int ncl_biowrite(struct vnode *, struct uio *, int, struct ucred *); -int ncl_vinvalbuf(struct vnode *, int, struct thread *, int); -int ncl_asyncio(struct nfsmount *, struct buf *, struct ucred *, -struct thread *); -int ncl_doio(struct vnode *, struct buf *, struct ucred *, struct thread *, +int ncl_bioread(struct vnode *, struct uio *, int, struct kauth_cred *); +int ncl_biowrite(struct vnode *, struct uio *, int, struct kauth_cred *); +int ncl_vinvalbuf(struct vnode *, int, struct kauth_cred *, int); +int ncl_asyncio(struct nfsmount *, struct buf *, struct kauth_cred *, +struct lwp *); +int ncl_doio(struct vnode *, struct buf *, struct kauth_cred *, struct lwp *, int); void ncl_nhinit(void); void ncl_nhuninit(void); void ncl_nodelock(struct nfsnode *); void ncl_nodeunlock(struct nfsnode *); int ncl_getattrcache(struct vnode *, struct vattr *); -int ncl_readrpc(struct vnode *, struct uio *, struct ucred *); -int ncl_writerpc(struct vnode *, struct uio *, struct ucred *, int *, int *, -int); -int ncl_readlinkrpc(struct vnode *, struct uio *, struct ucred *); -int ncl_readdirrpc(struct vnode *, struct uio *, struct ucred *, -struct thread *); -int ncl_readdirplusrpc(struct vnode *, struct uio *, struct ucred *, -struct thread *); -int ncl_writebp(struct buf *, int, struct thread *); -int ncl_commit(struct vnode *, u_quad_t, int, struct ucred *, struct thread *); +int ncl_readrpc(struct vnode *, struct uio *, struct kauth_cred *); +int ncl_writerpc(struct vnode *, struct uio *, struct kauth_cred *, int *, +int *, int); +int ncl_readlinkrpc(struct vnode *, struct uio *, struct kauth_cred *); +int ncl_readdirrpc(struct vnode *, struct uio *, struct kauth_cred *, +struct lwp *); +int ncl_readdirplusrpc(struct vnode *, struct uio *, struct kauth_cred *, +struct lwp *); +int ncl_writebp(struct buf *, int, struct lwp *); +int ncl_commit(struct vnode *, u_quad_t, int, struct kauth_cred *, +struct lwp *); void ncl_clearcommit(struct mount *); -int ncl_fsinfo(struct nfsmount *, struct vnode *, struct ucred *, -struct thread *); +int ncl_fsinfo(struct nfsmount *, struct vnode *, struct kauth_cred *, +struct lwp *); int ncl_init(struct vfsconf *); int ncl_uninit(struct vfsconf *); void ncl_nfsiodnew(void);
CVS commit: src/sys/fs/nfs/client
Module Name:src Committed By: pgoyette Date: Tue Dec 13 22:17:33 UTC 2016 Modified Files: src/sys/fs/nfs/client: nfs_clkrpc.c nfs_clnfsiod.c nfs_clnode.c nfs_clport.c nfs_clrpcops.c nfs_clstate.c nfs_clsubs.c nfs_clvfsops.c nfs_clvnops.c nfsmount.h nfsnode.h Log Message: Adapt code for our location of the nfs headers, and some updates for differences in kernel options(4) handling To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/sys/fs/nfs/client/nfs_clkrpc.c \ src/sys/fs/nfs/client/nfs_clnfsiod.c cvs rdiff -u -r1.2 -r1.3 src/sys/fs/nfs/client/nfs_clnode.c \ src/sys/fs/nfs/client/nfsmount.h src/sys/fs/nfs/client/nfsnode.h cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/fs/nfs/client/nfs_clport.c \ src/sys/fs/nfs/client/nfs_clrpcops.c src/sys/fs/nfs/client/nfs_clsubs.c \ src/sys/fs/nfs/client/nfs_clvfsops.c cvs rdiff -u -r1.3 -r1.4 src/sys/fs/nfs/client/nfs_clstate.c \ src/sys/fs/nfs/client/nfs_clvnops.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/fs/nfs/client/nfs_clkrpc.c diff -u src/sys/fs/nfs/client/nfs_clkrpc.c:1.1.1.1 src/sys/fs/nfs/client/nfs_clkrpc.c:1.2 --- src/sys/fs/nfs/client/nfs_clkrpc.c:1.1.1.1 Mon Sep 30 07:19:04 2013 +++ src/sys/fs/nfs/client/nfs_clkrpc.c Tue Dec 13 22:17:33 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: nfs_clkrpc.c,v 1.1.1.1 2013/09/30 07:19:04 dholland Exp $ */ +/* $NetBSD: nfs_clkrpc.c,v 1.2 2016/12/13 22:17:33 pgoyette Exp $ */ /*- * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -34,11 +34,13 @@ #include /* __FBSDID("FreeBSD: head/sys/fs/nfsclient/nfs_clkrpc.c 255216 2013-09-04 22:47:56Z rmacklem "); */ -__RCSID("$NetBSD: nfs_clkrpc.c,v 1.1.1.1 2013/09/30 07:19:04 dholland Exp $"); +__RCSID("$NetBSD: nfs_clkrpc.c,v 1.2 2016/12/13 22:17:33 pgoyette Exp $"); +#ifdef NOTYET /* _KERNEL_OPT */ #include "opt_kgssapi.h" +#endif -#include +#include #include #include Index: src/sys/fs/nfs/client/nfs_clnfsiod.c diff -u src/sys/fs/nfs/client/nfs_clnfsiod.c:1.1.1.1 src/sys/fs/nfs/client/nfs_clnfsiod.c:1.2 --- src/sys/fs/nfs/client/nfs_clnfsiod.c:1.1.1.1 Mon Sep 30 07:19:30 2013 +++ src/sys/fs/nfs/client/nfs_clnfsiod.c Tue Dec 13 22:17:33 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: nfs_clnfsiod.c,v 1.1.1.1 2013/09/30 07:19:30 dholland Exp $ */ +/* $NetBSD: nfs_clnfsiod.c,v 1.2 2016/12/13 22:17:33 pgoyette Exp $ */ /*- * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -35,7 +35,7 @@ #include /* __FBSDID("FreeBSD: head/sys/fs/nfsclient/nfs_clnfsiod.c 249630 2013-04-18 23:20:16Z rmacklem "); */ -__RCSID("$NetBSD: nfs_clnfsiod.c,v 1.1.1.1 2013/09/30 07:19:30 dholland Exp $"); +__RCSID("$NetBSD: nfs_clnfsiod.c,v 1.2 2016/12/13 22:17:33 pgoyette Exp $"); #include #include @@ -66,10 +66,10 @@ __RCSID("$NetBSD: nfs_clnfsiod.c,v 1.1.1 #include #include -#include -#include -#include -#include +#include +#include +#include +#include extern struct mtx ncl_iod_mutex; extern struct task ncl_nfsiodnew_task; Index: src/sys/fs/nfs/client/nfs_clnode.c diff -u src/sys/fs/nfs/client/nfs_clnode.c:1.2 src/sys/fs/nfs/client/nfs_clnode.c:1.3 --- src/sys/fs/nfs/client/nfs_clnode.c:1.2 Fri Nov 18 22:58:08 2016 +++ src/sys/fs/nfs/client/nfs_clnode.c Tue Dec 13 22:17:33 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: nfs_clnode.c,v 1.2 2016/11/18 22:58:08 pgoyette Exp $ */ +/* $NetBSD: nfs_clnode.c,v 1.3 2016/12/13 22:17:33 pgoyette Exp $ */ /*- * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -35,7 +35,7 @@ #include /* __FBSDID("FreeBSD: head/sys/fs/nfsclient/nfs_clnode.c 302210 2016-06-26 14:18:28Z kib "); */ -__RCSID("$NetBSD: nfs_clnode.c,v 1.2 2016/11/18 22:58:08 pgoyette Exp $"); +__RCSID("$NetBSD: nfs_clnode.c,v 1.3 2016/12/13 22:17:33 pgoyette Exp $"); #include #include @@ -52,13 +52,13 @@ __RCSID("$NetBSD: nfs_clnode.c,v 1.2 201 #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include +#include extern struct vop_vector newnfs_vnodeops; extern struct buf_ops buf_ops_newnfs; Index: src/sys/fs/nfs/client/nfsmount.h diff -u src/sys/fs/nfs/client/nfsmount.h:1.2 src/sys/fs/nfs/client/nfsmount.h:1.3 --- src/sys/fs/nfs/client/nfsmount.h:1.2 Fri Nov 18 22:58:08 2016 +++ src/sys/fs/nfs/client/nfsmount.h Tue Dec 13 22:17:33 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: nfsmount.h,v 1.2 2016/11/18 22:58:08 pgoyette Exp $ */ +/* $NetBSD: nfsmount.h,v 1.3 2016/12/13 22:17:33 pgoyette Exp $ */ /*- * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -31,13 +31,13 @@ * SUCH DAMAGE. * * FreeBSD: head/sys/fs/nfsclient/nfsmount.h 244042 2012-12-08 22:52:39Z rmacklem - * $NetBSD: nfsmount.h,v 1.2 2016/11/18 22:58:08 pgoyette Exp $
CVS commit: src/sys/fs/nfs/client
Module Name:src Committed By: pgoyette Date: Fri Nov 18 22:58:08 UTC 2016 Modified Files: src/sys/fs/nfs/client: nfs_clbio.c nfs_clcomsubs.c nfs_clkdtrace.c nfs_clnode.c nfsmount.h nfsnode.h Log Message: More clean-up of #includes To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/fs/nfs/client/nfs_clbio.c cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/fs/nfs/client/nfs_clcomsubs.c \ src/sys/fs/nfs/client/nfs_clnode.c src/sys/fs/nfs/client/nfsnode.h cvs rdiff -u -r1.1.1.1 -r1.2 src/sys/fs/nfs/client/nfs_clkdtrace.c \ src/sys/fs/nfs/client/nfsmount.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/fs/nfs/client/nfs_clbio.c diff -u src/sys/fs/nfs/client/nfs_clbio.c:1.3 src/sys/fs/nfs/client/nfs_clbio.c:1.4 --- src/sys/fs/nfs/client/nfs_clbio.c:1.3 Fri Nov 18 08:31:30 2016 +++ src/sys/fs/nfs/client/nfs_clbio.c Fri Nov 18 22:58:08 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: nfs_clbio.c,v 1.3 2016/11/18 08:31:30 pgoyette Exp $ */ +/* $NetBSD: nfs_clbio.c,v 1.4 2016/11/18 22:58:08 pgoyette Exp $ */ /*- * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -35,11 +35,10 @@ #include /* __FBSDID("FreeBSD: head/sys/fs/nfsclient/nfs_clbio.c 304026 2016-08-12 22:44:59Z rmacklem "); */ -__RCSID("$NetBSD: nfs_clbio.c,v 1.3 2016/11/18 08:31:30 pgoyette Exp $"); +__RCSID("$NetBSD: nfs_clbio.c,v 1.4 2016/11/18 22:58:08 pgoyette Exp $"); #include #include -#include #include #include #include @@ -47,19 +46,11 @@ __RCSID("$NetBSD: nfs_clbio.c,v 1.3 2016 #include #include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include extern int newnfs_directio_allow_mmap; extern struct nfsstatsv1 nfsstatsv1; Index: src/sys/fs/nfs/client/nfs_clcomsubs.c diff -u src/sys/fs/nfs/client/nfs_clcomsubs.c:1.1.1.2 src/sys/fs/nfs/client/nfs_clcomsubs.c:1.2 --- src/sys/fs/nfs/client/nfs_clcomsubs.c:1.1.1.2 Fri Nov 18 07:49:10 2016 +++ src/sys/fs/nfs/client/nfs_clcomsubs.c Fri Nov 18 22:58:08 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: nfs_clcomsubs.c,v 1.1.1.2 2016/11/18 07:49:10 pgoyette Exp $ */ +/* $NetBSD: nfs_clcomsubs.c,v 1.2 2016/11/18 22:58:08 pgoyette Exp $ */ /*- * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -34,7 +34,7 @@ #include /* __FBSDID("FreeBSD: head/sys/fs/nfsclient/nfs_clcomsubs.c 304026 2016-08-12 22:44:59Z rmacklem "); */ -__RCSID("$NetBSD: nfs_clcomsubs.c,v 1.1.1.2 2016/11/18 07:49:10 pgoyette Exp $"); +__RCSID("$NetBSD: nfs_clcomsubs.c,v 1.2 2016/11/18 22:58:08 pgoyette Exp $"); /* * These functions support the macros and help fiddle mbuf chains for @@ -42,7 +42,7 @@ __RCSID("$NetBSD: nfs_clcomsubs.c,v 1.1. * copy data between mbuf chains and uio lists. */ #ifndef APPLEKEXT -#include +#include extern struct nfsstatsv1 nfsstatsv1; extern struct nfsv4_opflag nfsv4_opflag[NFSV41_NOPS]; Index: src/sys/fs/nfs/client/nfs_clnode.c diff -u src/sys/fs/nfs/client/nfs_clnode.c:1.1.1.2 src/sys/fs/nfs/client/nfs_clnode.c:1.2 --- src/sys/fs/nfs/client/nfs_clnode.c:1.1.1.2 Fri Nov 18 07:49:11 2016 +++ src/sys/fs/nfs/client/nfs_clnode.c Fri Nov 18 22:58:08 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: nfs_clnode.c,v 1.1.1.2 2016/11/18 07:49:11 pgoyette Exp $ */ +/* $NetBSD: nfs_clnode.c,v 1.2 2016/11/18 22:58:08 pgoyette Exp $ */ /*- * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -35,7 +35,7 @@ #include /* __FBSDID("FreeBSD: head/sys/fs/nfsclient/nfs_clnode.c 302210 2016-06-26 14:18:28Z kib "); */ -__RCSID("$NetBSD: nfs_clnode.c,v 1.1.1.2 2016/11/18 07:49:11 pgoyette Exp $"); +__RCSID("$NetBSD: nfs_clnode.c,v 1.2 2016/11/18 22:58:08 pgoyette Exp $"); #include #include @@ -68,7 +68,7 @@ uma_zone_t newnfsnode_zone; const char nfs_vnode_tag[] = "nfs"; -static void nfs_freesillyrename(void *arg, __unused int pending); +static void nfs_freesillyrename(void *arg); void ncl_nhinit(void) @@ -191,7 +191,7 @@ ncl_nget(struct mount *mntp, u_int8_t *f * deadlock because of a LOR when vrele() locks the directory vnode. */ static void -nfs_freesillyrename(void *arg, __unused int pending) +nfs_freesillyrename(void *arg) { struct sillyrename *sp; @@ -222,8 +222,7 @@ ncl_releasesillyrename(struct vnode *vp, */ ncl_removeit(sp, vp); crfree(sp->s_cred); - TASK_INIT(&sp->s_task, 0, nfs_freesillyrename, sp); - taskqueue_enqueue(taskqueue_thread, &sp->s_task); + sysmon_task_queue_sched(0, nfs_freesillyrename, sp); mtx_lock(&np->n_mtx); } } Index: src/sys/fs/nfs/client/nfsnode.h diff -u src/sys/fs/nfs/client/nfsnode.h:1.1.1.2 src/sys/fs/nfs/client/nfsnode.h:1.2 --- src/sys/fs/nfs/client/nfsnode.h:1.1.1.2 Fri Nov 18 07:49:11 2016 +++ src/sys/fs/nfs/clie