+test_104() { # LU-6952
+ local mds_mountopts=$MDS_MOUNT_OPTS
+ local ost_mountopts=$OST_MOUNT_OPTS
+ local mds_mountfsopts=$MDS_MOUNT_FS_OPTS
+ local lctl_ver=$(do_facet $SINGLEMDS $LCTL --version |
+ awk '{ print $2 }')
+
+ [[ $(version_code $lctl_ver) -lt $(version_code 2.9.55) ]] &&
+ { skip "this test needs utils above 2.9.55" && return 0; }
+
+ # specify "acl" in mount options used by mkfs.lustre
+ if [ -z "$MDS_MOUNT_FS_OPTS" ]; then
+ MDS_MOUNT_FS_OPTS="acl,user_xattr"
+ else
+
+ MDS_MOUNT_FS_OPTS="${MDS_MOUNT_FS_OPTS},acl,user_xattr"
+ fi
+
+ echo "mountfsopt: $MDS_MOUNT_FS_OPTS"
+
+ #reformat/remount the MDT to apply the MDT_MOUNT_FS_OPT options
+ formatall
+ if [ -z "$MDS_MOUNT_OPTS" ]; then
+ MDS_MOUNT_OPTS="-o noacl"
+ else
+ MDS_MOUNT_OPTS="${MDS_MOUNT_OPTS},noacl"
+ fi
+
+ for num in $(seq $MDSCOUNT); do
+ start mds$num $(mdsdevname $num) $MDS_MOUNT_OPTS ||
+ error "Failed to start MDS"
+ done
+
+ for num in $(seq $OSTCOUNT); do
+ start ost$num $(ostdevname $num) $OST_MOUNT_OPTS ||
+ error "Failed to start OST"
+ done
+
+ mount_client $MOUNT
+ setfacl -m "d:$RUNAS_ID:rwx" $MOUNT &&
+ error "ACL is applied when FS is mounted with noacl."
+
+ MDS_MOUNT_OPTS=$mds_mountopts
+ OST_MOUNT_OPTS=$ost_mountopts
+ MDS_MOUNT_FS_OPTS=$mds_mountfsopts
+
+ formatall
+ setupall
+}
+run_test 104 "Make sure user defined options are reflected in mount"
+
+error_and_umount() {
+ umount $TMP/$tdir
+ rmdir $TMP/$tdir
+ error $*
+}
+
+test_105() {
+ cleanup
+ reformat
+ setup
+ mkdir -p $TMP/$tdir
+ mount --bind $DIR $TMP/$tdir || error "mount bind mnt pt failed"
+ rm -f $TMP/$tdir/$tfile
+ rm -f $TMP/$tdir/${tfile}1
+
+ # Files should not be created in ro bind mount point
+ # remounting from rw to ro
+ mount -o remount,ro $TMP/$tdir ||
+ error_and_umount "readonly remount of bind mnt pt failed"
+ touch $TMP/$tdir/$tfile &&
+ error_and_umount "touch succeeds on ro bind mnt pt"
+ [ -e $TMP/$tdir/$tfile ] &&
+ error_and_umount "file created on ro bind mnt pt"
+
+ # Files should be created in rw bind mount point
+ # remounting from ro to rw
+ mount -o remount,rw $TMP/$tdir ||
+ error_and_umount "read-write remount of bind mnt pt failed"
+ touch $TMP/$tdir/${tfile}1 ||
+ error_and_umount "touch fails on rw bind mnt pt"
+ [ -e $TMP/$tdir/${tfile}1 ] ||
+ error_and_umount "file not created on rw bind mnt pt"
+ umount $TMP/$tdir || error "umount of bind mnt pt failed"
+ rmdir $TMP/$tdir
+ cleanup || error "cleanup failed with $?"
+}
+run_test 105 "check file creation for ro and rw bind mnt pt"
+
+test_107() {
+ [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.10.50) ]] ||
+ { skip "Need MDS version > 2.10.50"; return; }
+
+ start_mgsmds || error "start_mgsmds failed"
+ start_ost || error "unable to start OST"
+
+ # add unknown configuration parameter.
+ local PARAM="$FSNAME-OST0000.ost.unknown_param=50"
+ do_facet mgs "$LCTL conf_param $PARAM"
+ cleanup_nocli || error "cleanup_nocli failed with $?"
+ load_modules
+
+ # unknown param should be ignored while mounting.
+ start_ost || error "unable to start OST after unknown param set"
+
+ cleanup || error "cleanup failed with $?"
+}
+run_test 107 "Unknown config param should not fail target mounting"
+