From owner-svn-src-all@freebsd.org  Sun Oct  8 21:20:27 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 68BC0E4053D;
 Sun,  8 Oct 2017 21:20:27 +0000 (UTC)
 (envelope-from rmacklem@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0738D6E7DC;
 Sun,  8 Oct 2017 21:20:26 +0000 (UTC)
 (envelope-from rmacklem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v98LKQ84087749;
 Sun, 8 Oct 2017 21:20:26 GMT (envelope-from rmacklem@FreeBSD.org)
Received: (from rmacklem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v98LKQ2u087748;
 Sun, 8 Oct 2017 21:20:26 GMT (envelope-from rmacklem@FreeBSD.org)
Message-Id: <201710082120.v98LKQ2u087748@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to
 rmacklem@FreeBSD.org using -f
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Sun, 8 Oct 2017 21:20:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r324419 - stable/11/sys/fs/nfsserver
X-SVN-Group: stable-11
X-SVN-Commit-Author: rmacklem
X-SVN-Commit-Paths: stable/11/sys/fs/nfsserver
X-SVN-Commit-Revision: 324419
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Oct 2017 21:20:27 -0000

Author: rmacklem
Date: Sun Oct  8 21:20:25 2017
New Revision: 324419
URL: https://svnweb.freebsd.org/changeset/base/324419

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/11/sys/fs/nfsserver/nfs_nfsdserv.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/fs/nfsserver/nfs_nfsdserv.c
==============================================================================
--- stable/11/sys/fs/nfsserver/nfs_nfsdserv.c	Sun Oct  8 20:55:45 2017	(r324418)
+++ stable/11/sys/fs/nfsserver/nfs_nfsdserv.c	Sun Oct  8 21:20:25 2017	(r324419)
@@ -921,7 +921,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;