svn commit: r325099 - in stable/10/sys: kern sys

[Konstantin Belousov]

Author: kib
Date: Sun Oct 29 09:48:28 2017
New Revision: 325099
URL: https://svnweb.freebsd.org/changeset/base/325099

Log:
  MFC r324853:
  Remove the support for mknod(S_IFMT), which created dummy vnodes with
  VBAD type.

Modified:
  stable/10/sys/kern/vfs_syscalls.c
  stable/10/sys/sys/priv.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/vfs_syscalls.c
==============================================================================
--- stable/10/sys/kern/vfs_syscalls.c	Sun Oct 29 09:38:42 2017	(r325098)
+++ stable/10/sys/kern/vfs_syscalls.c	Sun Oct 29 09:48:28 2017	(r325099)
@@ -1246,9 +1246,6 @@ kern_mknodat(struct thread *td, int fd, char *path, en
 		if (error == 0 && dev == VNOVAL)
 			error = EINVAL;
 		break;
-	case S_IFMT:
-		error = priv_check(td, PRIV_VFS_MKNOD_BAD);
-		break;
 	case S_IFWHT:
 		error = priv_check(td, PRIV_VFS_MKNOD_WHT);
 		break;
@@ -1286,9 +1283,6 @@ restart:
 		whiteout = 0;
 
 		switch (mode & S_IFMT) {
-		case S_IFMT:	/* used by badsect to flag bad sectors */
-			vattr.va_type = VBAD;
-			break;
 		case S_IFCHR:
 			vattr.va_type = VCHR;
 			break;

Modified: stable/10/sys/sys/priv.h
==============================================================================
--- stable/10/sys/sys/priv.h	Sun Oct 29 09:38:42 2017	(r325098)
+++ stable/10/sys/sys/priv.h	Sun Oct 29 09:48:28 2017	(r325099)
@@ -265,7 +265,7 @@
 #define	PRIV_VFS_GETFH		327	/* Can retrieve file handles. */
 #define	PRIV_VFS_GETQUOTA	328	/* getquota(). */
 #define	PRIV_VFS_LINK		329	/* bsd.hardlink_check_uid */
-#define	PRIV_VFS_MKNOD_BAD	330	/* Can mknod() to mark bad inodes. */
+#define	PRIV_VFS_MKNOD_BAD	330	/* Was: mknod() can mark bad inodes. */
 #define	PRIV_VFS_MKNOD_DEV	331	/* Can mknod() to create dev nodes. */
 #define	PRIV_VFS_MKNOD_WHT	332	/* Can mknod() to create whiteout. */
 #define	PRIV_VFS_MOUNT		333	/* Can mount(). */