svn commit: r365908 - stable/12/sys/fs/tmpfs

[Konstantin Belousov]

Author: kib
Date: Sat Sep 19 18:02:55 2020
New Revision: 365908
URL: https://svnweb.freebsd.org/changeset/base/365908

Log:
  MFC r365809:
  Style.

Modified:
  stable/12/sys/fs/tmpfs/tmpfs_subr.c
  stable/12/sys/fs/tmpfs/tmpfs_vnops.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/fs/tmpfs/tmpfs_subr.c
==============================================================================
--- stable/12/sys/fs/tmpfs/tmpfs_subr.c	Sat Sep 19 16:15:22 2020	(r365907)
+++ stable/12/sys/fs/tmpfs/tmpfs_subr.c	Sat Sep 19 18:02:55 2020	(r365908)
@@ -1584,7 +1584,7 @@ tmpfs_chflags(struct vnode *vp, u_long flags, struct u
 
 	/* Disallow this operation if the file system is mounted read-only. */
 	if (vp->v_mount->mnt_flag & MNT_RDONLY)
-		return EROFS;
+		return (EROFS);
 
 	/*
 	 * Callers may only modify the file flags on objects they
@@ -1703,11 +1703,11 @@ tmpfs_chown(struct vnode *vp, uid_t uid, gid_t gid, st
 
 	/* Disallow this operation if the file system is mounted read-only. */
 	if (vp->v_mount->mnt_flag & MNT_RDONLY)
-		return EROFS;
+		return (EROFS);
 
 	/* Immutable or append-only files cannot be modified, either. */
 	if (node->tn_flags & (IMMUTABLE | APPEND))
-		return EPERM;
+		return (EPERM);
 
 	/*
 	 * To modify the ownership of a file, must possess VADMIN for that
@@ -1764,11 +1764,11 @@ tmpfs_chsize(struct vnode *vp, u_quad_t size, struct u
 	error = 0;
 	switch (vp->v_type) {
 	case VDIR:
-		return EISDIR;
+		return (EISDIR);
 
 	case VREG:
 		if (vp->v_mount->mnt_flag & MNT_RDONLY)
-			return EROFS;
+			return (EROFS);
 		break;
 
 	case VBLK:
@@ -1776,23 +1776,27 @@ tmpfs_chsize(struct vnode *vp, u_quad_t size, struct u
 	case VCHR:
 		/* FALLTHROUGH */
 	case VFIFO:
-		/* Allow modifications of special files even if in the file
+		/*
+		 * Allow modifications of special files even if in the file
 		 * system is mounted read-only (we are not modifying the
-		 * files themselves, but the objects they represent). */
-		return 0;
+		 * files themselves, but the objects they represent).
+		 */
+		return (0);
 
 	default:
 		/* Anything else is unsupported. */
-		return EOPNOTSUPP;
+		return (EOPNOTSUPP);
 	}
 
 	/* Immutable or append-only files cannot be modified, either. */
 	if (node->tn_flags & (IMMUTABLE | APPEND))
-		return EPERM;
+		return (EPERM);
 
 	error = tmpfs_truncate(vp, size);
-	/* tmpfs_truncate will raise the NOTE_EXTEND and NOTE_ATTRIB kevents
-	 * for us, as will update tn_status; no need to do that here. */
+	/*
+	 * tmpfs_truncate will raise the NOTE_EXTEND and NOTE_ATTRIB kevents
+	 * for us, as will update tn_status; no need to do that here.
+	 */
 
 	ASSERT_VOP_ELOCKED(vp, "chsize2");
 
@@ -1817,11 +1821,11 @@ tmpfs_chtimes(struct vnode *vp, struct vattr *vap,
 
 	/* Disallow this operation if the file system is mounted read-only. */
 	if (vp->v_mount->mnt_flag & MNT_RDONLY)
-		return EROFS;
+		return (EROFS);
 
 	/* Immutable or append-only files cannot be modified, either. */
 	if (node->tn_flags & (IMMUTABLE | APPEND))
-		return EPERM;
+		return (EPERM);
 
 	error = vn_utimes_perm(vp, vap, cred, l);
 	if (error != 0)

Modified: stable/12/sys/fs/tmpfs/tmpfs_vnops.c
==============================================================================
--- stable/12/sys/fs/tmpfs/tmpfs_vnops.c	Sat Sep 19 16:15:22 2020	(r365907)
+++ stable/12/sys/fs/tmpfs/tmpfs_vnops.c	Sat Sep 19 18:02:55 2020	(r365908)
@@ -368,7 +368,7 @@ tmpfs_access(struct vop_access_args *v)
 out:
 	MPASS(VOP_ISLOCKED(vp));
 
-	return error;
+	return (error);
 }
 
 int
@@ -455,9 +455,11 @@ tmpfs_setattr(struct vop_setattr_args *v)
 	    vap->va_birthtime.tv_nsec != VNOVAL)))
 		error = tmpfs_chtimes(vp, vap, cred, td);
 
-	/* Update the node times.  We give preference to the error codes
+	/*
+	 * Update the node times.  We give preference to the error codes
 	 * generated by this function rather than the ones that may arise
-	 * from tmpfs_update. */
+	 * from tmpfs_update.
+	 */
 	tmpfs_update(vp);
 
 	MPASS(VOP_ISLOCKED(vp));
@@ -595,8 +597,7 @@ tmpfs_remove(struct vop_remove_args *v)
 	error = 0;
 
 out:
-
-	return error;
+	return (error);
 }
 
 static int