From owner-svn-src-head@FreeBSD.ORG Wed Jul 23 16:18:52 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 87CE3216; Wed, 23 Jul 2014 16:18:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 755C12E61; Wed, 23 Jul 2014 16:18:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6NGIqn7040341; Wed, 23 Jul 2014 16:18:52 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6NGIqwL040340; Wed, 23 Jul 2014 16:18:52 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201407231618.s6NGIqwL040340@svn.freebsd.org> From: Warner Losh Date: Wed, 23 Jul 2014 16:18:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r269018 - head/sys/fs/nandfs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18 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: Wed, 23 Jul 2014 16:18:52 -0000 Author: imp Date: Wed Jul 23 16:18:51 2014 New Revision: 269018 URL: http://svnweb.freebsd.org/changeset/base/269018 Log: Fix typo in comment: noone -> no one. Fix minor style(9) nits. Modified: head/sys/fs/nandfs/nandfs_vnops.c Modified: head/sys/fs/nandfs/nandfs_vnops.c ============================================================================== --- head/sys/fs/nandfs/nandfs_vnops.c Wed Jul 23 15:53:29 2014 (r269017) +++ head/sys/fs/nandfs/nandfs_vnops.c Wed Jul 23 16:18:51 2014 (r269018) @@ -405,8 +405,7 @@ nandfs_lookup(struct vop_cachedlookup_ar error = ENOENT; if ((nameiop == CREATE || nameiop == RENAME) && islastcn) { - error = VOP_ACCESS(dvp, VWRITE, cred, - td); + error = VOP_ACCESS(dvp, VWRITE, cred, td); if (!error) { /* keep the component name */ cnp->cn_flags |= SAVENAME; @@ -787,9 +786,8 @@ nandfs_chown(struct vnode *vp, uid_t uid node->nn_flags |= IN_CHANGE; if ((inode->i_mode & (ISUID | ISGID)) && (ouid != uid || ogid != gid)) { - if (priv_check_cred(cred, PRIV_VFS_RETAINSUGID, 0)) { + if (priv_check_cred(cred, PRIV_VFS_RETAINSUGID, 0)) inode->i_mode &= ~(ISUID | ISGID); - } } DPRINTF(VNCALL, ("%s: vp %p, cred %p, td %p - ret OK\n", __func__, vp, cred, td)); @@ -1006,7 +1004,7 @@ nandfs_check_possible(struct vnode *vp, return (EINVAL); } - /* Noone may write immutable files */ + /* No one may write immutable files */ if ((mode & VWRITE) && (VTON(vp)->nn_inode.i_flags & IMMUTABLE)) return (EPERM); @@ -1049,9 +1047,8 @@ nandfs_access(struct vop_access_args *ap return (error); error = nandfs_check_possible(vp, &vap, accmode); - if (error) { + if (error) return (error); - } error = nandfs_check_permitted(vp, &vap, accmode, cred);