diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c
index 6a51b1cba31b..f446ec6c5811 100644
--- a/sys/compat/linux/linux_stats.c
+++ b/sys/compat/linux/linux_stats.c
@@ -237,13 +237,8 @@ bsd_to_linux_statfs(struct thread *td, struct statfs *bsd_statfs,
 	linux_statfs->f_bavail = bsd_statfs->f_bavail;
 	linux_statfs->f_ffree = bsd_statfs->f_ffree;
 	linux_statfs->f_files = bsd_statfs->f_files;
-	if (suser(td)) {
-		linux_statfs->f_fsid.val[0] = 0;
-		linux_statfs->f_fsid.val[1] = 0;
-	} else {
-		linux_statfs->f_fsid.val[0] = bsd_statfs->f_fsid.val[0];
-		linux_statfs->f_fsid.val[1] = bsd_statfs->f_fsid.val[1];
-	}
+	linux_statfs->f_fsid.val[0] = bsd_statfs->f_fsid.val[0];
+	linux_statfs->f_fsid.val[1] = bsd_statfs->f_fsid.val[1];
 	linux_statfs->f_namelen = MAXNAMLEN;
 }
 
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index fc04e6440038..3e8c96870a64 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -557,6 +557,8 @@ freebsd4_getfsstat(td, uap)
 			}
 			sp->f_flags = mp->mnt_flag & MNT_VISFLAGMASK;
 			cvtstatfs(td, sp, &osb);
+			if (suser(td))
+				osb.f_fsid.val[0] = osb.f_fsid.val[1] = 0;
 			error = copyout(&osb, sfsp, sizeof(osb));
 			if (error) {
 				vfs_unbusy(mp, td);
@@ -639,11 +641,7 @@ cvtstatfs(td, nsp, osp)
 	    MIN(MFSNAMELEN, OMNAMELEN));
 	bcopy(nsp->f_mntfromname, osp->f_mntfromname,
 	    MIN(MFSNAMELEN, OMNAMELEN));
-	if (suser(td)) {
-		osp->f_fsid.val[0] = osp->f_fsid.val[1] = 0;
-	} else {
-		osp->f_fsid = nsp->f_fsid;
-	}
+	osp->f_fsid = nsp->f_fsid;
 }
 #endif /* COMPAT_FREEBSD4 */
 
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index fc04e6440038..3e8c96870a64 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -557,6 +557,8 @@ freebsd4_getfsstat(td, uap)
 			}
 			sp->f_flags = mp->mnt_flag & MNT_VISFLAGMASK;
 			cvtstatfs(td, sp, &osb);
+			if (suser(td))
+				osb.f_fsid.val[0] = osb.f_fsid.val[1] = 0;
 			error = copyout(&osb, sfsp, sizeof(osb));
 			if (error) {
 				vfs_unbusy(mp, td);
@@ -639,11 +641,7 @@ cvtstatfs(td, nsp, osp)
 	    MIN(MFSNAMELEN, OMNAMELEN));
 	bcopy(nsp->f_mntfromname, osp->f_mntfromname,
 	    MIN(MFSNAMELEN, OMNAMELEN));
-	if (suser(td)) {
-		osp->f_fsid.val[0] = osp->f_fsid.val[1] = 0;
-	} else {
-		osp->f_fsid = nsp->f_fsid;
-	}
+	osp->f_fsid = nsp->f_fsid;
 }
 #endif /* COMPAT_FREEBSD4 */