svn commit: r324544 - stable/10/sys/fs/nfsserver

Rick Macklem rmacklem at FreeBSD.org
Wed Oct 11 23:33:52 UTC 2017


Author: rmacklem
Date: Wed Oct 11 23:33:50 2017
New Revision: 324544
URL: https://svnweb.freebsd.org/changeset/base/324544

Log:
  MFC: r323978
  Change a panic to an error return.
  
  There was a panic() in the NFS server's write operation that didn't
  need to be a panic() and could just be an error return.
  This patch makes that change.
  Found by code inspection during development of the pNFS service.

Modified:
  stable/10/sys/fs/nfsserver/nfs_nfsdserv.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/fs/nfsserver/nfs_nfsdserv.c
==============================================================================
--- stable/10/sys/fs/nfsserver/nfs_nfsdserv.c	Wed Oct 11 23:21:24 2017	(r324543)
+++ stable/10/sys/fs/nfsserver/nfs_nfsdserv.c	Wed Oct 11 23:33:50 2017	(r324544)
@@ -910,7 +910,7 @@ nfsrvd_write(struct nfsrv_descript *nd, __unused int i
 		    nd->nd_md, nd->nd_dpos, nd->nd_cred, p);
 		error = nfsm_advance(nd, NFSM_RNDUP(retlen), -1);
 		if (error)
-			panic("nfsrv_write mbuf");
+			goto nfsmout;
 	}
 	if (nd->nd_flag & ND_NFSV4)
 		aftat_ret = 0;


More information about the svn-src-all mailing list