svn commit: r269018 - head/sys/fs/nandfs

Warner Losh imp at FreeBSD.org
Wed Jul 23 16:18:52 UTC 2014


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);
 


More information about the svn-src-head mailing list