svn commit: r311956 - in stable/11/sys: compat/freebsd32 kern

[Konstantin Belousov]

Author: kib
Date: Thu Jan 12 01:05:34 2017
New Revision: 311956
URL: https://svnweb.freebsd.org/changeset/base/311956

Log:
  MFC r311447:
  Some style fixes for getfstat(2)-related code.

Modified:
  stable/11/sys/compat/freebsd32/freebsd32_misc.c
  stable/11/sys/kern/vfs_syscalls.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/compat/freebsd32/freebsd32_misc.c
==============================================================================
--- stable/11/sys/compat/freebsd32/freebsd32_misc.c	Thu Jan 12 00:50:37 2017	(r311955)
+++ stable/11/sys/compat/freebsd32/freebsd32_misc.c	Thu Jan 12 01:05:34 2017	(r311956)
@@ -244,7 +244,8 @@ copy_statfs(struct statfs *in, struct st
 
 #ifdef COMPAT_FREEBSD4
 int
-freebsd4_freebsd32_getfsstat(struct thread *td, struct freebsd4_freebsd32_getfsstat_args *uap)
+freebsd4_freebsd32_getfsstat(struct thread *td,
+    struct freebsd4_freebsd32_getfsstat_args *uap)
 {
 	struct statfs *buf, *sp;
 	struct statfs32 stat32;

Modified: stable/11/sys/kern/vfs_syscalls.c
==============================================================================
--- stable/11/sys/kern/vfs_syscalls.c	Thu Jan 12 00:50:37 2017	(r311955)
+++ stable/11/sys/kern/vfs_syscalls.c	Thu Jan 12 01:05:34 2017	(r311956)
@@ -476,7 +476,7 @@ restart:
 				continue;
 			}
 		}
-		if (sfsp && count < maxcount) {
+		if (sfsp != NULL && count < maxcount) {
 			sp = &mp->mnt_stat;
 			/*
 			 * Set these in case the underlying filesystem
@@ -521,7 +521,7 @@ restart:
 		vfs_unbusy(mp);
 	}
 	mtx_unlock(&mountlist_mtx);
-	if (sfsp && count > maxcount)
+	if (sfsp != NULL && count > maxcount)
 		*countp = maxcount;
 	else
 		*countp = count;