svn commit: r355684 - in head/sys/fs: nfsclient nfsserver

[Rick Macklem]

Author: rmacklem
Date: Fri Dec 13 01:34:25 2019
New Revision: 355684
URL: https://svnweb.freebsd.org/changeset/base/355684

Log:
  Add some more initializations to quiet riscv build.
  
  The one case in nfs_copy_file_range() was a legitimate case, although
  it would probably never occur in practice.

Modified:
  head/sys/fs/nfsclient/nfs_clvnops.c
  head/sys/fs/nfsserver/nfs_nfsdport.c

Modified: head/sys/fs/nfsclient/nfs_clvnops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clvnops.c	Fri Dec 13 01:17:20 2019	(r355683)
+++ head/sys/fs/nfsclient/nfs_clvnops.c	Fri Dec 13 01:34:25 2019	(r355684)
@@ -3639,6 +3639,7 @@ nfs_copy_file_range(struct vop_copy_file_range_args *a
 	off_t inoff, outoff;
 	bool consecutive, must_commit, tryoutcred;
 
+	ret = ret2 = 0;
 	nmp = VFSTONFS(invp->v_mount);
 	mtx_lock(&nmp->nm_mtx);
 	/* NFSv4.2 Copy is not permitted for infile == outfile. */

Modified: head/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdport.c	Fri Dec 13 01:17:20 2019	(r355683)
+++ head/sys/fs/nfsserver/nfs_nfsdport.c	Fri Dec 13 01:34:25 2019	(r355684)
@@ -5155,7 +5155,7 @@ nfsrv_writedsrpc(fhandle_t *fhp, off_t off, int len, s
     NFSPROC_T *p, struct vnode *vp, struct nfsmount **nmpp, int mirrorcnt,
     struct mbuf **mpp, char *cp, int *failposp)
 {
-	struct nfsrvwritedsdorpc *drpc, *tdrpc;
+	struct nfsrvwritedsdorpc *drpc, *tdrpc = NULL;
 	struct nfsvattr na;
 	struct mbuf *m;
 	int error, i, offs, ret, timo;
@@ -5322,7 +5322,7 @@ nfsrv_allocatedsrpc(fhandle_t *fhp, off_t off, off_t l
     NFSPROC_T *p, struct vnode *vp, struct nfsmount **nmpp, int mirrorcnt,
     int *failposp)
 {
-	struct nfsrvallocatedsdorpc *drpc, *tdrpc;
+	struct nfsrvallocatedsdorpc *drpc, *tdrpc = NULL;
 	struct nfsvattr na;
 	int error, i, ret, timo;
 
@@ -5506,7 +5506,7 @@ nfsrv_setattrdsrpc(fhandle_t *fhp, struct ucred *cred,
     struct vnode *vp, struct nfsmount **nmpp, int mirrorcnt,
     struct nfsvattr *nap, int *failposp)
 {
-	struct nfsrvsetattrdsdorpc *drpc, *tdrpc;
+	struct nfsrvsetattrdsdorpc *drpc, *tdrpc = NULL;
 	struct nfsvattr na;
 	int error, i, ret, timo;
 
@@ -5655,7 +5655,7 @@ nfsrv_setacldsrpc(fhandle_t *fhp, struct ucred *cred, 
     struct vnode *vp, struct nfsmount **nmpp, int mirrorcnt, struct acl *aclp,
     int *failposp)
 {
-	struct nfsrvsetacldsdorpc *drpc, *tdrpc;
+	struct nfsrvsetacldsdorpc *drpc, *tdrpc = NULL;
 	int error, i, ret, timo;
 
 	NFSD_DEBUG(4, "in nfsrv_setacldsrpc\n");