Date: Mon, 4 Mar 2019 14:30:54 +0000 (UTC) From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r344762 - in head/sys/fs: nfs nfsserver Message-ID: <201903041430.x24EUsrZ045681@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: trasz Date: Mon Mar 4 14:30:53 2019 New Revision: 344762 URL: https://svnweb.freebsd.org/changeset/base/344762 Log: Don't pass td to nfsvno_createsub(). MFC after: 2 weeks Sponsored by: DARPA, AFRL Modified: head/sys/fs/nfs/nfs_var.h head/sys/fs/nfsserver/nfs_nfsdport.c head/sys/fs/nfsserver/nfs_nfsdserv.c Modified: head/sys/fs/nfs/nfs_var.h ============================================================================== --- head/sys/fs/nfs/nfs_var.h Mon Mar 4 14:30:37 2019 (r344761) +++ head/sys/fs/nfs/nfs_var.h Mon Mar 4 14:30:53 2019 (r344762) @@ -649,7 +649,7 @@ int nfsvno_read(vnode_t, off_t, int, struct ucred *, N int nfsvno_write(vnode_t, off_t, int, int, int *, mbuf_t, char *, struct ucred *, NFSPROC_T *); int nfsvno_createsub(struct nfsrv_descript *, struct nameidata *, - vnode_t *, struct nfsvattr *, int *, int32_t *, NFSDEV_T, NFSPROC_T *, + vnode_t *, struct nfsvattr *, int *, int32_t *, NFSDEV_T, struct nfsexstuff *); int nfsvno_mknod(struct nameidata *, struct nfsvattr *, struct ucred *, NFSPROC_T *); Modified: head/sys/fs/nfsserver/nfs_nfsdport.c ============================================================================== --- head/sys/fs/nfsserver/nfs_nfsdport.c Mon Mar 4 14:30:37 2019 (r344761) +++ head/sys/fs/nfsserver/nfs_nfsdport.c Mon Mar 4 14:30:53 2019 (r344762) @@ -949,10 +949,11 @@ nfsvno_write(struct vnode *vp, off_t off, int retlen, int nfsvno_createsub(struct nfsrv_descript *nd, struct nameidata *ndp, struct vnode **vpp, struct nfsvattr *nvap, int *exclusive_flagp, - int32_t *cverf, NFSDEV_T rdev, struct thread *p, struct nfsexstuff *exp) + int32_t *cverf, NFSDEV_T rdev, struct nfsexstuff *exp) { u_quad_t tempsize; int error; + struct thread *p = curthread; error = nd->nd_repstat; if (!error && ndp->ni_vp == NULL) { Modified: head/sys/fs/nfsserver/nfs_nfsdserv.c ============================================================================== --- head/sys/fs/nfsserver/nfs_nfsdserv.c Mon Mar 4 14:30:37 2019 (r344761) +++ head/sys/fs/nfsserver/nfs_nfsdserv.c Mon Mar 4 14:30:53 2019 (r344762) @@ -1185,7 +1185,7 @@ nfsrvd_create(struct nfsrv_descript *nd, __unused int * should I set the mode too ? */ nd->nd_repstat = nfsvno_createsub(nd, &named, &vp, &nva, - &exclusive_flag, cverf, rdev, p, exp); + &exclusive_flag, cverf, rdev, exp); if (!nd->nd_repstat) { nd->nd_repstat = nfsvno_getfh(vp, &fh, p);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903041430.x24EUsrZ045681>