From: Emoly Liu <emoly.liu@intel.com>
Date: Sat, 5 Aug 2017 19:04:51 +0000 (-0400)
Subject: LU-9376 tests: remove sanity.sh test_103b
X-Git-Tag: 2.10.52~23
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=30faa618bbc8775595bf25803d06410fe0e67fd6;p=fs%2Flustre-release.git

LU-9376 tests: remove sanity.sh test_103b

Remove mount option "noacl" related things from sanity.sh test_103b
and mount.lustre.8.

Test-Parameters: trivial

Signed-off-by: Emoly Liu <emoly.liu@intel.com>
Change-Id: I3da4500cc177894b10854c2ccd9ed884fec74789
Reviewed-on: https://review.whamcloud.com/27109
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/doc/mount.lustre.8 b/lustre/doc/mount.lustre.8
index 2b77c23..fb16ecf 100644
--- a/lustre/doc/mount.lustre.8
+++ b/lustre/doc/mount.lustre.8
@@ -219,9 +219,6 @@ Enable POSIX Access Control List support.  See the
 .BR acl (5)
 manual page.
 .TP
-.BI noacl
-Disable Access Control List support.
-.TP
 .BI nosvc
 Only start the MGC (and MGS, if co-located) for a target service, and not the actual service.
 .TP
diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index c059a2b..5e0cf1a 100755
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -7542,43 +7542,6 @@ test_103a() {
 }
 run_test 103a "acl test ========================================="
 
-test_103b() {
-	remote_mds_nodsh && skip "remote MDS with nodsh" && return
-        local noacl=false
-        local MDT_DEV=$(mdsdevname ${SINGLEMDS//mds/})
-        local mountopts=$MDS_MOUNT_OPTS
-
-        if [[ "$MDS_MOUNT_OPTS" =~ "noacl" ]]; then
-                noacl=true
-        else
-                # stop the MDT
-                stop $SINGLEMDS || error "failed to stop MDT."
-                # remount the MDT
-                if [ -z "$MDS_MOUNT_OPTS" ]; then
-                        MDS_MOUNT_OPTS="-o noacl"
-                else
-                        MDS_MOUNT_OPTS="${MDS_MOUNT_OPTS},noacl"
-                fi
-                start $SINGLEMDS $MDT_DEV $MDS_MOUNT_OPTS ||
-                        error "failed to start MDT."
-                MDS_MOUNT_OPTS=$mountopts
-        fi
-
-        touch $DIR/$tfile
-        setfacl -m u:bin:rw $DIR/$tfile && error "setfacl should fail"
-
-        if ! $noacl; then
-                # stop the MDT
-                stop $SINGLEMDS || error "failed to stop MDT."
-                # remount the MDT
-                start $SINGLEMDS $MDT_DEV $MDS_MOUNT_OPTS ||
-                        error "failed to start MDT."
-        fi
-
-	true
-}
-run_test 103b "MDS mount option 'noacl'"
-
 test_103c() {
 	mkdir -p $DIR/$tdir
 	cp -rp $DIR/$tdir $DIR/$tdir.bak