From owner-svn-src-head@FreeBSD.ORG Mon Nov 3 19:33:21 2008 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 26B181065674; Mon, 3 Nov 2008 19:33:21 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 156A78FC0C; Mon, 3 Nov 2008 19:33:21 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mA3JXKst074265; Mon, 3 Nov 2008 19:33:20 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA3JXKWY074264; Mon, 3 Nov 2008 19:33:20 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <200811031933.mA3JXKWY074264@svn.freebsd.org> From: John Baldwin Date: Mon, 3 Nov 2008 19:33:20 +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: r184597 - head/sys/kern 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, 03 Nov 2008 19:33:21 -0000 Author: jhb Date: Mon Nov 3 19:33:20 2008 New Revision: 184597 URL: http://svn.freebsd.org/changeset/base/184597 Log: A few style nits. Modified: head/sys/kern/vfs_lookup.c Modified: head/sys/kern/vfs_lookup.c ============================================================================== --- head/sys/kern/vfs_lookup.c Mon Nov 3 18:28:12 2008 (r184596) +++ head/sys/kern/vfs_lookup.c Mon Nov 3 19:33:20 2008 (r184597) @@ -331,12 +331,13 @@ namei(struct nameidata *ndp) static int compute_cn_lkflags(struct mount *mp, int lkflags) { + if (mp == NULL || ((lkflags & LK_SHARED) && !(mp->mnt_kern_flag & MNTK_LOOKUP_SHARED))) { lkflags &= ~LK_SHARED; lkflags |= LK_EXCLUSIVE; } - return lkflags; + return (lkflags); } /*