From owner-svn-src-head@FreeBSD.ORG Mon Jul 19 23:33:43 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 14AF51065670; Mon, 19 Jul 2010 23:33:43 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0716D8FC0A; Mon, 19 Jul 2010 23:33:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6JNXgZ1017318; Mon, 19 Jul 2010 23:33:42 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6JNXg3F017316; Mon, 19 Jul 2010 23:33:42 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201007192333.o6JNXg3F017316@svn.freebsd.org> From: Rick Macklem Date: Mon, 19 Jul 2010 23:33:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210268 - head/sys/fs/nfs X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jul 2010 23:33:43 -0000 Author: rmacklem Date: Mon Jul 19 23:33:42 2010 New Revision: 210268 URL: http://svn.freebsd.org/changeset/base/210268 Log: For the experimental NFSv4 server's dumplocks operation, add the MPSAFE flag to cn_flags so that it doesn't panic. The panics weren't seen since nfsdumpstate(8) is broken for the "-l" case, so this was never done. I'll do a separate commit to fix nfsdumpstate(8). Submitted by: zack.kirsch at isilon.com MFC after: 2 weeks Modified: head/sys/fs/nfs/nfs_commonport.c Modified: head/sys/fs/nfs/nfs_commonport.c ============================================================================== --- head/sys/fs/nfs/nfs_commonport.c Mon Jul 19 23:25:19 2010 (r210267) +++ head/sys/fs/nfs/nfs_commonport.c Mon Jul 19 23:33:42 2010 (r210268) @@ -210,7 +210,8 @@ nfsrv_lookupfilename(struct nameidata *n { int error; - NDINIT(ndp, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE, fname, p); + NDINIT(ndp, LOOKUP, FOLLOW | LOCKLEAF | MPSAFE, UIO_USERSPACE, fname, + p); error = namei(ndp); if (!error) { NDFREE(ndp, NDF_ONLY_PNBUF);