Remove the SF_NOUNLINK and UF_NOUNLINK from the test files, we dont

support them; Cuts down false-postives.

ok pedro@

21 files changed, 57 insertions, 257 deletions

diff --git a/regress/sys/ffs/tests/chflags/00.t b/regress/sys/ffs/tests/chflags/00.t
index 56110ebaa43..688f43d681d 100644
--- a/regress/sys/ffs/tests/chflags/00.t
+++ b/regress/sys/ffs/tests/chflags/00.t
@@ -13,36 +13,36 @@ cd ${n2}
 
 expect 0 create ${n0} 0644
 expect none stat ${n0} flags
-expect 0 chflags ${n0} UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_NOUNLINK,UF_OPAQUE,SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND,SF_NOUNLINK
-expect UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_NOUNLINK,UF_OPAQUE,SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND,SF_NOUNLINK stat ${n0} flags
-expect 0 chflags ${n0} UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_NOUNLINK,UF_OPAQUE
-expect UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_NOUNLINK,UF_OPAQUE stat ${n0} flags
-expect 0 chflags ${n0} SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND,SF_NOUNLINK
-expect SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND,SF_NOUNLINK stat ${n0} flags
+expect 0 chflags ${n0} UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_OPAQUE,SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND
+expect UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_OPAQUE,SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND stat ${n0} flags
+expect 0 chflags ${n0} UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_OPAQUE
+expect UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_OPAQUE stat ${n0} flags
+expect 0 chflags ${n0} SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND
+expect SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND stat ${n0} flags
 expect 0 chflags ${n0} none
 expect none stat ${n0} flags
 expect 0 unlink ${n0}
 
 expect 0 mkdir ${n0} 0644
 expect none stat ${n0} flags
-expect 0 chflags ${n0} UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_NOUNLINK,UF_OPAQUE,SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND,SF_NOUNLINK
-expect UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_NOUNLINK,UF_OPAQUE,SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND,SF_NOUNLINK stat ${n0} flags
-expect 0 chflags ${n0} UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_NOUNLINK,UF_OPAQUE
-expect UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_NOUNLINK,UF_OPAQUE stat ${n0} flags
-expect 0 chflags ${n0} SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND,SF_NOUNLINK
-expect SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND,SF_NOUNLINK stat ${n0} flags
+expect 0 chflags ${n0} UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_OPAQUE,SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND
+expect UF_NODUMP,UF_IMMUTABLE,UF_APPEND,,UF_OPAQUE,SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND stat ${n0} flags
+expect 0 chflags ${n0} UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_OPAQUE
+expect UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_OPAQUE stat ${n0} flags
+expect 0 chflags ${n0} SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND
+expect SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND stat ${n0} flags
 expect 0 chflags ${n0} none
 expect none stat ${n0} flags
 expect 0 rmdir ${n0}
 
 expect 0 mkfifo ${n0} 0644
 expect none stat ${n0} flags
-expect 0 chflags ${n0} UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_NOUNLINK,UF_OPAQUE,SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND,SF_NOUNLINK
-expect UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_NOUNLINK,UF_OPAQUE,SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND,SF_NOUNLINK stat ${n0} flags
-expect 0 chflags ${n0} UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_NOUNLINK,UF_OPAQUE
-expect UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_NOUNLINK,UF_OPAQUE stat ${n0} flags
-expect 0 chflags ${n0} SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND,SF_NOUNLINK
-expect SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND,SF_NOUNLINK stat ${n0} flags
+expect 0 chflags ${n0} UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_OPAQUE,SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND
+expect UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_OPAQUE,SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND stat ${n0} flags
+expect 0 chflags ${n0} UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_OPAQUE
+expect UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_OPAQUE stat ${n0} flags
+expect 0 chflags ${n0} SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND
+expect SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND stat ${n0} flags
 expect 0 chflags ${n0} none
 expect none stat ${n0} flags
 expect 0 unlink ${n0}
@@ -51,14 +51,14 @@ expect 0 create ${n0} 0644
 expect 0 symlink ${n0} ${n1}
 expect none stat ${n1} flags
 expect none lstat ${n1} flags
-expect 0 chflags ${n1} UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_NOUNLINK,UF_OPAQUE,SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND,SF_NOUNLINK
-expect UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_NOUNLINK,UF_OPAQUE,SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND,SF_NOUNLINK stat ${n1} flags
+expect 0 chflags ${n1} UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_OPAQUE,SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND
+expect UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_OPAQUE,SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND stat ${n1} flags
 expect none lstat ${n1} flags
-expect 0 chflags ${n1} UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_NOUNLINK,UF_OPAQUE
-expect UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_NOUNLINK,UF_OPAQUE stat ${n1} flags
+expect 0 chflags ${n1} UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_OPAQUE
+expect UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_OPAQUE stat ${n1} flags
 expect none lstat ${n1} flags
-expect 0 chflags ${n1} SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND,SF_NOUNLINK
-expect SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND,SF_NOUNLINK stat ${n1} flags
+expect 0 chflags ${n1} SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND
+expect SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND stat ${n1} flags
 expect none lstat ${n1} flags
 expect 0 chflags ${n1} none
 expect none stat ${n1} flags
@@ -70,14 +70,14 @@ expect 0 create ${n0} 0644
 expect 0 symlink ${n0} ${n1}
 expect none stat ${n1} flags
 expect none lstat ${n1} flags
-expect 0 lchflags ${n1} UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_NOUNLINK,UF_OPAQUE,SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND,SF_NOUNLINK
-expect UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_NOUNLINK,UF_OPAQUE,SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND,SF_NOUNLINK lstat ${n1} flags
+expect 0 lchflags ${n1} UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_OPAQUE,SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND
+expect UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_OPAQUE,SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND lstat ${n1} flags
 expect none stat ${n1} flags
-expect 0 lchflags ${n1} UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_NOUNLINK,UF_OPAQUE
-expect UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_NOUNLINK,UF_OPAQUE lstat ${n1} flags
+expect 0 lchflags ${n1} UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_OPAQUE
+expect UF_NODUMP,UF_IMMUTABLE,UF_APPEND,UF_OPAQUE lstat ${n1} flags
 expect none stat ${n1} flags
-expect 0 lchflags ${n1} SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND,SF_NOUNLINK
-expect SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND,SF_NOUNLINK lstat ${n1} flags
+expect 0 lchflags ${n1} SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND
+expect SF_ARCHIVED,SF_IMMUTABLE,SF_APPEND lstat ${n1} flags
 expect none stat ${n1} flags
 expect 0 lchflags ${n1} none
 expect none lstat ${n1} flags
@@ -87,7 +87,7 @@ expect 0 unlink ${n0}
 
 # successful chflags(2) updates ctime.
 expect 0 create ${n0} 0644
-for flag in UF_NODUMP UF_IMMUTABLE UF_APPEND UF_NOUNLINK UF_OPAQUE SF_ARCHIVED SF_IMMUTABLE SF_APPEND SF_NOUNLINK none; do
+for flag in UF_NODUMP UF_IMMUTABLE UF_APPEND UF_OPAQUE SF_ARCHIVED SF_IMMUTABLE SF_APPEND none; do
 	ctime1=`${FSTEST} stat ${n0} ctime`
 	sleep 1
 	expect 0 chflags ${n0} ${flag}
@@ -97,7 +97,7 @@ done
 expect 0 unlink ${n0}
 
 expect 0 mkdir ${n0} 0755
-for flag in UF_NODUMP UF_IMMUTABLE UF_APPEND UF_NOUNLINK UF_OPAQUE SF_ARCHIVED SF_IMMUTABLE SF_APPEND SF_NOUNLINK none; do
+for flag in UF_NODUMP UF_IMMUTABLE UF_APPEND UF_OPAQUE SF_ARCHIVED SF_IMMUTABLE SF_APPEND none; do
 	ctime1=`${FSTEST} stat ${n0} ctime`
 	sleep 1
 	expect 0 chflags ${n0} ${flag}
@@ -107,7 +107,7 @@ done
 expect 0 rmdir ${n0}
 
 expect 0 mkfifo ${n0} 0644
-for flag in UF_NODUMP UF_IMMUTABLE UF_APPEND UF_NOUNLINK UF_OPAQUE SF_ARCHIVED SF_IMMUTABLE SF_APPEND SF_NOUNLINK none; do
+for flag in UF_NODUMP UF_IMMUTABLE UF_APPEND UF_OPAQUE SF_ARCHIVED SF_IMMUTABLE SF_APPEND none; do
 	ctime1=`${FSTEST} stat ${n0} ctime`
 	sleep 1
 	expect 0 chflags ${n0} ${flag}
@@ -117,7 +117,7 @@ done
 expect 0 unlink ${n0}
 
 expect 0 symlink ${n1} ${n0}
-for flag in UF_NODUMP UF_IMMUTABLE UF_APPEND UF_NOUNLINK UF_OPAQUE SF_ARCHIVED SF_IMMUTABLE SF_APPEND SF_NOUNLINK none; do
+for flag in UF_NODUMP UF_IMMUTABLE UF_APPEND UF_OPAQUE SF_ARCHIVED SF_IMMUTABLE SF_APPEND none; do
 	ctime1=`${FSTEST} lstat ${n0} ctime`
 	sleep 1
 	expect 0 lchflags ${n0} ${flag}
diff --git a/regress/sys/ffs/tests/chflags/08.t b/regress/sys/ffs/tests/chflags/08.t
index d135dc621fb..fad75054c74 100644
--- a/regress/sys/ffs/tests/chflags/08.t
+++ b/regress/sys/ffs/tests/chflags/08.t
@@ -1,7 +1,7 @@
 #!/bin/sh
 # $FreeBSD: src/tools/regression/fstest/tests/chflags/08.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
-desc="chflags returns EPERM when one of SF_IMMUTABLE, SF_APPEND, or SF_NOUNLINK is set and the user is not the super-user"
+desc="chflags returns EPERM when one of SF_IMMUTABLE or SF_APPEND, is set and the user is not the super-user"
 
 n0=`namegen`
 n1=`namegen`
@@ -13,7 +13,7 @@ cd ${n0}
 
 expect 0 create ${n1} 0644
 expect 0 chown ${n1} 65534 65534
-for flag in SF_IMMUTABLE SF_APPEND SF_NOUNLINK; do
+for flag in SF_IMMUTABLE SF_APPEND ; do
 	expect 0 chflags ${n1} ${flag}
 	expect EPERM -u 65533 -g 65533 chflags ${n1} UF_IMMUTABLE
 	expect ${flag} stat ${n1} flags
@@ -25,7 +25,7 @@ expect 0 unlink ${n1}
 
 expect 0 mkdir ${n1} 0755
 expect 0 chown ${n1} 65534 65534
-for flag in SF_IMMUTABLE SF_APPEND SF_NOUNLINK; do
+for flag in SF_IMMUTABLE SF_APPEND ; do
 	expect 0 chflags ${n1} ${flag}
 	expect EPERM -u 65533 -g 65533 chflags ${n1} UF_IMMUTABLE
 	expect ${flag} stat ${n1} flags
@@ -37,7 +37,7 @@ expect 0 rmdir ${n1}
 
 expect 0 mkfifo ${n1} 0644
 expect 0 chown ${n1} 65534 65534
-for flag in SF_IMMUTABLE SF_APPEND SF_NOUNLINK; do
+for flag in SF_IMMUTABLE SF_APPEND ; do
 	expect 0 chflags ${n1} ${flag}
 	expect EPERM -u 65533 -g 65533 chflags ${n1} UF_IMMUTABLE
 	expect ${flag} stat ${n1} flags
@@ -49,7 +49,7 @@ expect 0 unlink ${n1}
 
 expect 0 symlink ${n2} ${n1}
 expect 0 lchown ${n1} 65534 65534
-for flag in SF_IMMUTABLE SF_APPEND SF_NOUNLINK; do
+for flag in SF_IMMUTABLE SF_APPEND ; do
 	expect 0 lchflags ${n1} ${flag}
 	expect EPERM -u 65533 -g 65533 lchflags ${n1} UF_IMMUTABLE
 	expect ${flag} lstat ${n1} flags
diff --git a/regress/sys/ffs/tests/chflags/09.t b/regress/sys/ffs/tests/chflags/09.t
index 57560e7ebce..0302ef1835e 100644
--- a/regress/sys/ffs/tests/chflags/09.t
+++ b/regress/sys/ffs/tests/chflags/09.t
@@ -1,7 +1,7 @@
 #!/bin/sh
 # $FreeBSD: src/tools/regression/fstest/tests/chflags/09.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
-desc="chflags returns EPERM when one of SF_IMMUTABLE, SF_APPEND, or SF_NOUNLINK is set and securelevel is greater than 0"
+desc="chflags returns EPERM when one of SF_IMMUTABLE or SF_APPEND is set and securelevel is greater than 0"
 
 n0=`namegen`
 n1=`namegen`
@@ -13,7 +13,7 @@ cd ${n0}
 
 expect 0 create ${n1} 0644
 expect 0 chown ${n1} 65534 65534
-for flag in SF_IMMUTABLE SF_APPEND SF_NOUNLINK; do
+for flag in SF_IMMUTABLE SF_APPEND; do
 	expect 0 chflags ${n1} ${flag}
 	expect ${flag} stat ${n1} flags
 done
@@ -22,7 +22,7 @@ expect 0 unlink ${n1}
 
 expect 0 mkdir ${n1} 0755
 expect 0 chown ${n1} 65534 65534
-for flag in SF_IMMUTABLE SF_APPEND SF_NOUNLINK; do
+for flag in SF_IMMUTABLE SF_APPEND; do
 	expect 0 chflags ${n1} ${flag}
 	expect ${flag} stat ${n1} flags
 done
@@ -31,7 +31,7 @@ expect 0 rmdir ${n1}
 
 expect 0 mkfifo ${n1} 0644
 expect 0 chown ${n1} 65534 65534
-for flag in SF_IMMUTABLE SF_APPEND SF_NOUNLINK; do
+for flag in SF_IMMUTABLE SF_APPEND; do
 	expect 0 chflags ${n1} ${flag}
 	expect ${flag} stat ${n1} flags
 done
@@ -40,7 +40,7 @@ expect 0 unlink ${n1}
 
 expect 0 symlink ${n2} ${n1}
 expect 0 lchown ${n1} 65534 65534
-for flag in SF_IMMUTABLE SF_APPEND SF_NOUNLINK; do
+for flag in SF_IMMUTABLE SF_APPEND; do
 	expect 0 lchflags ${n1} ${flag}
 	expect ${flag} lstat ${n1} flags
 done
diff --git a/regress/sys/ffs/tests/chflags/10.t b/regress/sys/ffs/tests/chflags/10.t
index 6094ead7c47..c04ea12ec51 100644
--- a/regress/sys/ffs/tests/chflags/10.t
+++ b/regress/sys/ffs/tests/chflags/10.t
@@ -1,7 +1,7 @@
 #!/bin/sh
 # $FreeBSD: src/tools/regression/fstest/tests/chflags/10.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
-desc="chflags returns EPERM if non-super-user tries to set one of SF_IMMUTABLE, SF_APPEND, or SF_NOUNLINK"
+desc="chflags returns EPERM if non-super-user tries to set one of SF_IMMUTABLE, SF_APPEND"
 
 n0=`namegen`
 n1=`namegen`
@@ -13,7 +13,7 @@ cd ${n0}
 
 expect 0 create ${n1} 0644
 expect 0 chown ${n1} 65534 65534
-for flag in SF_IMMUTABLE SF_APPEND SF_NOUNLINK; do
+for flag in SF_IMMUTABLE SF_APPEND; do
 	expect EPERM -u 65533 -g 65533 chflags ${n1} ${flag}
 	expect none stat ${n1} flags
 	expect EPERM -u 65534 -g 65534 chflags ${n1} ${flag}
@@ -23,7 +23,7 @@ expect 0 unlink ${n1}
 
 expect 0 mkdir ${n1} 0755
 expect 0 chown ${n1} 65534 65534
-for flag in SF_IMMUTABLE SF_APPEND SF_NOUNLINK; do
+for flag in SF_IMMUTABLE SF_APPEND; do
 	expect EPERM -u 65533 -g 65533 chflags ${n1} ${flag}
 	expect none stat ${n1} flags
 	expect EPERM -u 65534 -g 65534 chflags ${n1} ${flag}
@@ -33,7 +33,7 @@ expect 0 rmdir ${n1}
 
 expect 0 mkfifo ${n1} 0644
 expect 0 chown ${n1} 65534 65534
-for flag in SF_IMMUTABLE SF_APPEND SF_NOUNLINK; do
+for flag in SF_IMMUTABLE SF_APPEND; do
 	expect EPERM -u 65533 -g 65533 chflags ${n1} ${flag}
 	expect none stat ${n1} flags
 	expect EPERM -u 65534 -g 65534 chflags ${n1} ${flag}
@@ -43,7 +43,7 @@ expect 0 unlink ${n1}
 
 expect 0 symlink ${n2} ${n1}
 expect 0 lchown ${n1} 65534 65534
-for flag in SF_IMMUTABLE SF_APPEND SF_NOUNLINK; do
+for flag in SF_IMMUTABLE SF_APPEND; do
 	expect EPERM -u 65533 -g 65533 lchflags ${n1} ${flag}
 	expect none lstat ${n1} flags
 	expect EPERM -u 65534 -g 65534 lchflags ${n1} ${flag}
diff --git a/regress/sys/ffs/tests/chmod/08.t b/regress/sys/ffs/tests/chmod/08.t
index 3008b79efa8..dc3fceef935 100644
--- a/regress/sys/ffs/tests/chmod/08.t
+++ b/regress/sys/ffs/tests/chmod/08.t
@@ -36,17 +36,3 @@ expect 0644 stat ${n0} mode
 expect 0 chflags ${n0} none
 expect 0 chmod ${n0} 0600
 expect 0 unlink ${n0}
-
-expect 0 create ${n0} 0644
-expect 0 chflags ${n0} SF_NOUNLINK
-expect 0 chmod ${n0} 0600
-expect 0600 stat ${n0} mode
-expect 0 chflags ${n0} none
-expect 0 unlink ${n0}
-
-expect 0 create ${n0} 0644
-expect 0 chflags ${n0} UF_NOUNLINK
-expect 0 chmod ${n0} 0600
-expect 0600 stat ${n0} mode
-expect 0 chflags ${n0} none
-expect 0 unlink ${n0}
diff --git a/regress/sys/ffs/tests/chown/08.t b/regress/sys/ffs/tests/chown/08.t
index da83e6ac58c..4fe7b69b9b1 100644
--- a/regress/sys/ffs/tests/chown/08.t
+++ b/regress/sys/ffs/tests/chown/08.t
@@ -32,15 +32,3 @@ expect EPERM chown ${n0} 65534 65534
 expect 0 chflags ${n0} none
 expect 0 chown ${n0} 65534 65534
 expect 0 unlink ${n0}
-
-expect 0 create ${n0} 0644
-expect 0 chflags ${n0} SF_NOUNLINK
-expect 0 chown ${n0} 65534 65534
-expect 0 chflags ${n0} none
-expect 0 unlink ${n0}
-
-expect 0 create ${n0} 0644
-expect 0 chflags ${n0} UF_NOUNLINK
-expect 0 chown ${n0} 65534 65534
-expect 0 chflags ${n0} none
-expect 0 unlink ${n0}
diff --git a/regress/sys/ffs/tests/link/12.t b/regress/sys/ffs/tests/link/12.t
index ee8049509c9..f5e1813eb00 100644
--- a/regress/sys/ffs/tests/link/12.t
+++ b/regress/sys/ffs/tests/link/12.t
@@ -35,14 +35,4 @@ expect 0 chflags ${n0} none
 expect 0 link ${n0} ${n1}
 expect 0 unlink ${n1}
 
-expect 0 chflags ${n0} SF_NOUNLINK
-expect 0 link ${n0} ${n1}
-expect 0 chflags ${n0} none
-expect 0 unlink ${n1}
-
-expect 0 chflags ${n0} UF_NOUNLINK
-expect 0 link ${n0} ${n1}
-expect 0 chflags ${n0} none
-expect 0 unlink ${n1}
-
 expect 0 unlink ${n0}
diff --git a/regress/sys/ffs/tests/link/13.t b/regress/sys/ffs/tests/link/13.t
index fca74a4237f..2328a0da39c 100644
--- a/regress/sys/ffs/tests/link/13.t
+++ b/regress/sys/ffs/tests/link/13.t
@@ -35,15 +35,5 @@ expect 0 link ${n0}/${n1} ${n0}/${n2}
 expect 0 chflags ${n0} none
 expect 0 unlink ${n0}/${n2}
 
-expect 0 chflags ${n0} SF_NOUNLINK
-expect 0 link ${n0}/${n1} ${n0}/${n2}
-expect 0 chflags ${n0} none
-expect 0 unlink ${n0}/${n2}
-
-expect 0 chflags ${n0} UF_NOUNLINK
-expect 0 link ${n0}/${n1} ${n0}/${n2}
-expect 0 chflags ${n0} none
-expect 0 unlink ${n0}/${n2}
-
 expect 0 unlink ${n0}/${n1}
 expect 0 rmdir ${n0}
diff --git a/regress/sys/ffs/tests/mkdir/08.t b/regress/sys/ffs/tests/mkdir/08.t
index 39bf7bc804e..475b1cb7b99 100644
--- a/regress/sys/ffs/tests/mkdir/08.t
+++ b/regress/sys/ffs/tests/mkdir/08.t
@@ -33,14 +33,4 @@ expect 0 mkdir ${n0}/${n1} 0755
 expect 0 chflags ${n0} none
 expect 0 rmdir ${n0}/${n1}
 
-expect 0 chflags ${n0} SF_NOUNLINK
-expect 0 mkdir ${n0}/${n1} 0755
-expect 0 rmdir ${n0}/${n1}
-expect 0 chflags ${n0} none
-
-expect 0 chflags ${n0} UF_NOUNLINK
-expect 0 mkdir ${n0}/${n1} 0755
-expect 0 rmdir ${n0}/${n1}
-expect 0 chflags ${n0} none
-
 expect 0 rmdir ${n0}
diff --git a/regress/sys/ffs/tests/mkfifo/10.t b/regress/sys/ffs/tests/mkfifo/10.t
index 26bdb526361..e9a27831abc 100644
--- a/regress/sys/ffs/tests/mkfifo/10.t
+++ b/regress/sys/ffs/tests/mkfifo/10.t
@@ -33,14 +33,4 @@ expect 0 mkfifo ${n0}/${n1} 0644
 expect 0 chflags ${n0} none
 expect 0 unlink ${n0}/${n1}
 
-expect 0 chflags ${n0} SF_NOUNLINK
-expect 0 mkfifo ${n0}/${n1} 0644
-expect 0 unlink ${n0}/${n1}
-expect 0 chflags ${n0} none
-
-expect 0 chflags ${n0} UF_NOUNLINK
-expect 0 mkfifo ${n0}/${n1} 0644
-expect 0 unlink ${n0}/${n1}
-expect 0 chflags ${n0} none
-
 expect 0 rmdir ${n0}
diff --git a/regress/sys/ffs/tests/open/09.t b/regress/sys/ffs/tests/open/09.t
index 71532485efc..b70fa4410d7 100644
--- a/regress/sys/ffs/tests/open/09.t
+++ b/regress/sys/ffs/tests/open/09.t
@@ -33,14 +33,4 @@ expect 0 open ${n0}/${n1} O_RDONLY,O_CREAT 0644
 expect 0 chflags ${n0} none
 expect 0 unlink ${n0}/${n1}
 
-expect 0 chflags ${n0} SF_NOUNLINK
-expect 0 open ${n0}/${n1} O_RDONLY,O_CREAT 0644
-expect 0 chflags ${n0} none
-expect 0 unlink ${n0}/${n1}
-
-expect 0 chflags ${n0} UF_NOUNLINK
-expect 0 symlink test ${n0}/${n1}
-expect 0 chflags ${n0} none
-expect 0 unlink ${n0}/${n1}
-
 expect 0 rmdir ${n0}
diff --git a/regress/sys/ffs/tests/open/10.t b/regress/sys/ffs/tests/open/10.t
index 0a207743e4c..9ab10bbb8bf 100644
--- a/regress/sys/ffs/tests/open/10.t
+++ b/regress/sys/ffs/tests/open/10.t
@@ -20,19 +20,3 @@ expect EPERM open ${n0} O_RDWR
 expect EPERM open ${n0} O_RDONLY,O_TRUNC
 expect 0 chflags ${n0} none
 expect 0 unlink ${n0}
-
-expect 0 create ${n0} 0644
-expect 0 chflags ${n0} SF_NOUNLINK
-expect 0 open ${n0} O_WRONLY
-expect 0 open ${n0} O_RDWR
-expect 0 open ${n0} O_RDONLY,O_TRUNC
-expect 0 chflags ${n0} none
-expect 0 unlink ${n0}
-
-expect 0 create ${n0} 0644
-expect 0 chflags ${n0} UF_NOUNLINK
-expect 0 open ${n0} O_WRONLY
-expect 0 open ${n0} O_RDWR
-expect 0 open ${n0} O_RDONLY,O_TRUNC
-expect 0 chflags ${n0} none
-expect 0 unlink ${n0}
diff --git a/regress/sys/ffs/tests/rename/06.t b/regress/sys/ffs/tests/rename/06.t
index 82524752d1c..78a7a0e1b74 100644
--- a/regress/sys/ffs/tests/rename/06.t
+++ b/regress/sys/ffs/tests/rename/06.t
@@ -7,7 +7,7 @@ n0=`namegen`
 n1=`namegen`
 
 expect 0 create ${n0} 0644
-for flag in SF_IMMUTABLE UF_IMMUTABLE SF_APPEND UF_APPEND SF_NOUNLINK UF_NOUNLINK; do
+for flag in SF_IMMUTABLE UF_IMMUTABLE SF_APPEND UF_APPEND; do
 	expect 0 chflags ${n0} ${flag}
 	expect ${flag} stat ${n0} flags
 	expect EPERM rename ${n0} ${n1}
@@ -16,7 +16,7 @@ expect 0 chflags ${n0} none
 expect 0 unlink ${n0}
 
 expect 0 mkdir ${n0} 0755
-for flag in SF_IMMUTABLE UF_IMMUTABLE SF_APPEND UF_APPEND SF_NOUNLINK UF_NOUNLINK; do
+for flag in SF_IMMUTABLE UF_IMMUTABLE SF_APPEND UF_APPEND; do
 	expect 0 chflags ${n0} ${flag}
 	expect ${flag} stat ${n0} flags
 	expect EPERM rename ${n0} ${n1}
@@ -25,7 +25,7 @@ expect 0 chflags ${n0} none
 expect 0 rmdir ${n0}
 
 expect 0 mkfifo ${n0} 0644
-for flag in SF_IMMUTABLE UF_IMMUTABLE SF_APPEND UF_APPEND SF_NOUNLINK UF_NOUNLINK; do
+for flag in SF_IMMUTABLE UF_IMMUTABLE SF_APPEND UF_APPEND; do
 	expect 0 chflags ${n0} ${flag}
 	expect ${flag} stat ${n0} flags
 	expect EPERM rename ${n0} ${n1}
@@ -34,7 +34,7 @@ expect 0 chflags ${n0} none
 expect 0 unlink ${n0}
 
 expect 0 symlink ${n1} ${n0}
-for flag in SF_IMMUTABLE UF_IMMUTABLE SF_APPEND UF_APPEND SF_NOUNLINK UF_NOUNLINK; do
+for flag in SF_IMMUTABLE UF_IMMUTABLE SF_APPEND UF_APPEND; do
 	expect 0 lchflags ${n0} ${flag}
 	expect ${flag} lstat ${n0} flags
 	expect EPERM rename ${n0} ${n1}
diff --git a/regress/sys/ffs/tests/rename/07.t b/regress/sys/ffs/tests/rename/07.t
index a48fc7b9c7d..5ae71123955 100644
--- a/regress/sys/ffs/tests/rename/07.t
+++ b/regress/sys/ffs/tests/rename/07.t
@@ -45,44 +45,4 @@ done
 expect 0 chflags ${n0} none
 expect 0 unlink ${n0}/${n1}
 
-expect 0 create ${n0}/${n1} 0644
-for flag in SF_NOUNLINK UF_NOUNLINK; do
-	expect 0 chflags ${n0} ${flag}
-	expect ${flag} stat ${n0} flags
-	expect 0 rename ${n0}/${n1} ${n2}
-	expect 0 rename ${n2} ${n0}/${n1}
-done
-expect 0 chflags ${n0} none
-expect 0 unlink ${n0}/${n1}
-
-expect 0 mkdir ${n0}/${n1} 0755
-for flag in SF_NOUNLINK UF_NOUNLINK; do
-	expect 0 chflags ${n0} ${flag}
-	expect ${flag} stat ${n0} flags
-	expect 0 rename ${n0}/${n1} ${n2}
-	expect 0 rename ${n2} ${n0}/${n1}
-done
-expect 0 chflags ${n0} none
-expect 0 rmdir ${n0}/${n1}
-
-expect 0 mkfifo ${n0}/${n1} 0644
-for flag in SF_NOUNLINK UF_NOUNLINK; do
-	expect 0 chflags ${n0} ${flag}
-	expect ${flag} stat ${n0} flags
-	expect 0 rename ${n0}/${n1} ${n2}
-	expect 0 rename ${n2} ${n0}/${n1}
-done
-expect 0 chflags ${n0} none
-expect 0 unlink ${n0}/${n1}
-
-expect 0 symlink ${n2} ${n0}/${n1}
-for flag in SF_NOUNLINK UF_NOUNLINK; do
-	expect 0 chflags ${n0} ${flag}
-	expect ${flag} stat ${n0} flags
-	expect 0 rename ${n0}/${n1} ${n2}
-	expect 0 rename ${n2} ${n0}/${n1}
-done
-expect 0 chflags ${n0} none
-expect 0 unlink ${n0}/${n1}
-
 expect 0 rmdir ${n0}
diff --git a/regress/sys/ffs/tests/rename/08.t b/regress/sys/ffs/tests/rename/08.t
index b9d3e29ff04..a4e69317519 100644
--- a/regress/sys/ffs/tests/rename/08.t
+++ b/regress/sys/ffs/tests/rename/08.t
@@ -46,7 +46,7 @@ expect 0 chflags ${n0} none
 expect 0 unlink ${n1}
 
 expect 0 create ${n1} 0644
-for flag in SF_APPEND UF_APPEND SF_NOUNLINK UF_NOUNLINK; do
+for flag in SF_APPEND UF_APPEND; do
 	expect 0 chflags ${n0} ${flag}
 	expect ${flag} stat ${n0} flags
 	expect 0 rename ${n1} ${n0}/${n2}
@@ -56,7 +56,7 @@ done
 expect 0 unlink ${n1}
 
 expect 0 mkdir ${n1} 0755
-for flag in SF_APPEND UF_APPEND SF_NOUNLINK UF_NOUNLINK; do
+for flag in SF_APPEND UF_APPEND; do
 	expect 0 chflags ${n0} ${flag}
 	expect ${flag} stat ${n0} flags
 	expect 0 rename ${n1} ${n0}/${n2}
@@ -66,7 +66,7 @@ done
 expect 0 rmdir ${n1}
 
 expect 0 mkfifo ${n1} 0644
-for flag in SF_APPEND UF_APPEND SF_NOUNLINK UF_NOUNLINK; do
+for flag in SF_APPEND UF_APPEND; do
 	expect 0 chflags ${n0} ${flag}
 	expect ${flag} stat ${n0} flags
 	expect 0 rename ${n1} ${n0}/${n2}
@@ -76,7 +76,7 @@ done
 expect 0 unlink ${n1}
 
 expect 0 symlink ${n2} ${n1}
-for flag in SF_APPEND UF_APPEND SF_NOUNLINK UF_NOUNLINK; do
+for flag in SF_APPEND UF_APPEND; do
 	expect 0 chflags ${n0} ${flag}
 	expect ${flag} stat ${n0} flags
 	expect 0 rename ${n1} ${n0}/${n2}
diff --git a/regress/sys/ffs/tests/rmdir/09.t b/regress/sys/ffs/tests/rmdir/09.t
index 93e00085cb8..143b688a991 100644
--- a/regress/sys/ffs/tests/rmdir/09.t
+++ b/regress/sys/ffs/tests/rmdir/09.t
@@ -18,18 +18,6 @@ expect 0 chflags ${n0} none
 expect 0 rmdir ${n0}
 
 expect 0 mkdir ${n0} 0755
-expect 0 chflags ${n0} SF_NOUNLINK
-expect EPERM rmdir ${n0}
-expect 0 chflags ${n0} none
-expect 0 rmdir ${n0}
-
-expect 0 mkdir ${n0} 0755
-expect 0 chflags ${n0} UF_NOUNLINK
-expect EPERM rmdir ${n0}
-expect 0 chflags ${n0} none
-expect 0 rmdir ${n0}
-
-expect 0 mkdir ${n0} 0755
 expect 0 chflags ${n0} SF_APPEND
 expect EPERM rmdir ${n0}
 expect 0 chflags ${n0} none
diff --git a/regress/sys/ffs/tests/rmdir/10.t b/regress/sys/ffs/tests/rmdir/10.t
index 7e51a85c37e..e0ffac54317 100644
--- a/regress/sys/ffs/tests/rmdir/10.t
+++ b/regress/sys/ffs/tests/rmdir/10.t
@@ -32,14 +32,4 @@ expect EPERM rmdir ${n0}/${n1}
 expect 0 chflags ${n0} none
 expect 0 rmdir ${n0}/${n1}
 
-expect 0 mkdir ${n0}/${n1} 0755
-expect 0 chflags ${n0} SF_NOUNLINK
-expect 0 rmdir ${n0}/${n1}
-expect 0 chflags ${n0} none
-
-expect 0 mkdir ${n0}/${n1} 0755
-expect 0 chflags ${n0} UF_NOUNLINK
-expect 0 rmdir ${n0}/${n1}
-expect 0 chflags ${n0} none
-
 expect 0 rmdir ${n0}
diff --git a/regress/sys/ffs/tests/symlink/09.t b/regress/sys/ffs/tests/symlink/09.t
index 9cc96ad2c1e..b10a089222d 100644
--- a/regress/sys/ffs/tests/symlink/09.t
+++ b/regress/sys/ffs/tests/symlink/09.t
@@ -33,14 +33,4 @@ expect 0 symlink test ${n0}/${n1}
 expect 0 chflags ${n0} none
 expect 0 unlink ${n0}/${n1}
 
-expect 0 chflags ${n0} SF_NOUNLINK
-expect 0 symlink test ${n0}/${n1}
-expect 0 chflags ${n0} none
-expect 0 unlink ${n0}/${n1}
-
-expect 0 chflags ${n0} UF_NOUNLINK
-expect 0 symlink test ${n0}/${n1}
-expect 0 chflags ${n0} none
-expect 0 unlink ${n0}/${n1}
-
 expect 0 rmdir ${n0}
diff --git a/regress/sys/ffs/tests/truncate/08.t b/regress/sys/ffs/tests/truncate/08.t
index 48ab6a843d8..52d63046217 100644
--- a/regress/sys/ffs/tests/truncate/08.t
+++ b/regress/sys/ffs/tests/truncate/08.t
@@ -36,17 +36,3 @@ expect 0 stat ${n0} size
 expect 0 chflags ${n0} none
 expect 0 truncate ${n0} 123
 expect 0 unlink ${n0}
-
-expect 0 create ${n0} 0644
-expect 0 chflags ${n0} SF_NOUNLINK
-expect 0 truncate ${n0} 123
-expect 123 stat ${n0} size
-expect 0 chflags ${n0} none
-expect 0 unlink ${n0}
-
-expect 0 create ${n0} 0644
-expect 0 chflags ${n0} UF_NOUNLINK
-expect 0 truncate ${n0} 123
-expect 123 stat ${n0} size
-expect 0 chflags ${n0} none
-expect 0 unlink ${n0}
diff --git a/regress/sys/ffs/tests/unlink/09.t b/regress/sys/ffs/tests/unlink/09.t
index f5a5a24d599..908f2c18d33 100644
--- a/regress/sys/ffs/tests/unlink/09.t
+++ b/regress/sys/ffs/tests/unlink/09.t
@@ -18,18 +18,6 @@ expect 0 chflags ${n0} none
 expect 0 unlink ${n0}
 
 expect 0 create ${n0} 0644
-expect 0 chflags ${n0} SF_NOUNLINK
-expect EPERM unlink ${n0}
-expect 0 chflags ${n0} none
-expect 0 unlink ${n0}
-
-expect 0 create ${n0} 0644
-expect 0 chflags ${n0} UF_NOUNLINK
-expect EPERM unlink ${n0}
-expect 0 chflags ${n0} none
-expect 0 unlink ${n0}
-
-expect 0 create ${n0} 0644
 expect 0 chflags ${n0} SF_APPEND
 expect EPERM unlink ${n0}
 expect 0 chflags ${n0} none
diff --git a/regress/sys/ffs/tests/unlink/10.t b/regress/sys/ffs/tests/unlink/10.t
index 5128bb97a73..363b5f5a3fa 100644
--- a/regress/sys/ffs/tests/unlink/10.t
+++ b/regress/sys/ffs/tests/unlink/10.t
@@ -32,14 +32,4 @@ expect EPERM unlink ${n0}/${n1}
 expect 0 chflags ${n0} none
 expect 0 unlink ${n0}/${n1}
 
-expect 0 create ${n0}/${n1} 0644
-expect 0 chflags ${n0} SF_NOUNLINK
-expect 0 unlink ${n0}/${n1}
-expect 0 chflags ${n0} none
-
-expect 0 create ${n0}/${n1} 0644
-expect 0 chflags ${n0} UF_NOUNLINK
-expect 0 unlink ${n0}/${n1}
-expect 0 chflags ${n0} none
-
 expect 0 rmdir ${n0}