From e46f55115bf69032dd0e3e9b9406a2f8fdfa5dc4 Mon Sep 17 00:00:00 2001 From: kib Date: Thu, 12 Jan 2017 01:20:51 +0000 Subject: [PATCH] MFC r311447: Some style fixes for getfstat(2)-related code. git-svn-id: svn://svn.freebsd.org/base/stable/10@311959 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/compat/freebsd32/freebsd32_misc.c | 3 ++- sys/kern/vfs_syscalls.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 2f60c138b..db5e45d03 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -244,7 +244,8 @@ copy_statfs(struct statfs *in, struct statfs32 *out) #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; diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 9f922db22..5701e5aaf 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -464,7 +464,7 @@ kern_getfsstat(struct thread *td, struct statfs **buf, size_t bufsize, nmp = TAILQ_NEXT(mp, mnt_list); continue; } - if (sfsp && count < maxcount) { + if (sfsp != NULL && count < maxcount) { sp = &mp->mnt_stat; /* * Set these in case the underlying filesystem @@ -509,7 +509,7 @@ kern_getfsstat(struct thread *td, struct statfs **buf, size_t bufsize, vfs_unbusy(mp); } mtx_unlock(&mountlist_mtx); - if (sfsp && count > maxcount) + if (sfsp != NULL && count > maxcount) td->td_retval[0] = maxcount; else td->td_retval[0] = count; -- 2.45.0