From owner-p4-projects@FreeBSD.ORG Fri Jul 14 16:11:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F2D5C16A4E5; Fri, 14 Jul 2006 16:11:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CEA0B16A4E1 for ; Fri, 14 Jul 2006 16:11:44 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6727943D46 for ; Fri, 14 Jul 2006 16:11:44 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6EGBi0c005046 for ; Fri, 14 Jul 2006 16:11:44 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6EGBifR005043 for perforce@freebsd.org; Fri, 14 Jul 2006 16:11:44 GMT (envelope-from jhb@freebsd.org) Date: Fri, 14 Jul 2006 16:11:44 GMT Message-Id: <200607141611.k6EGBifR005043@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 101569 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Jul 2006 16:11:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=101569 Change 101569 by jhb@jhb_mutex on 2006/07/14 16:11:31 Add conditional VFS Giant locking to svr4_sys_resolvepath() and mark MPSAFE. Affected files ... .. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#52 edit .. //depot/projects/smpng/sys/compat/svr4/syscalls.master#19 edit .. //depot/projects/smpng/sys/notes#81 edit Differences ... ==== //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#52 (text+ko) ==== @@ -1601,12 +1601,14 @@ struct nameidata nd; int error, *retval = td->td_retval; unsigned int ncopy; + int vfslocked; - NDINIT(&nd, LOOKUP, NOFOLLOW | SAVENAME, UIO_USERSPACE, + NDINIT(&nd, LOOKUP, NOFOLLOW | SAVENAME | MPSAFE, UIO_USERSPACE, uap->path, td); if ((error = namei(&nd)) != 0) return error; + vfslocked = NDHASGIANT(&nd); ncopy = min(uap->bufsiz, strlen(nd.ni_cnd.cn_pnbuf) + 1); if ((error = copyout(nd.ni_cnd.cn_pnbuf, uap->buf, ncopy)) != 0) @@ -1616,5 +1618,6 @@ bad: NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_vp); + VFS_UNLOCK_GIANT(vfslocked); return error; } ==== //depot/projects/smpng/sys/compat/svr4/syscalls.master#19 (text+ko) ==== @@ -320,7 +320,7 @@ 206 AUE_NULL UNIMPL schedctl 207 AUE_NULL UNIMPL pset 208 AUE_NULL UNIMPL whoknows -209 AUE_NULL STD { int svr4_sys_resolvepath(const char *path, \ +209 AUE_NULL MSTD { int svr4_sys_resolvepath(const char *path, \ char *buf, size_t bufsiz); } 210 AUE_NULL UNIMPL signotifywait 211 AUE_NULL UNIMPL lwp_sigredirect ==== //depot/projects/smpng/sys/notes#81 (text+ko) ==== @@ -88,8 +88,8 @@ - svr4_sys_getmsg() - svr4_sys_putmsg() - svr4_sys_waitsys() - - svr4_sys_fchroot() - - svr4_sys_resolvepath() + + svr4_sys_fchroot() + + svr4_sys_resolvepath() + linux + linux_uselib() + ibcs2