OpenZFS 8071 - zfs-tests: 7290 missed some cases

Authored by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: John Kennedy <jwk404@gmail.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Ported-by: bunder2015 <omfgbunder@gmail.com>

OpenZFS-issue: https://www.illumos.org/issues/8071
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/e84991e
Closes #6161
This commit is contained in:
Yuri Pankov 2017-05-24 06:46:28 -04:00 committed by Brian Behlendorf
parent 0071036526
commit ea8c83fdda
3 changed files with 10 additions and 13 deletions

View File

@ -52,9 +52,7 @@ function cleanup
[[ -n $cwd ]] && log_must cd $cwd [[ -n $cwd ]] && log_must cd $cwd
if [[ -d $TESTDIR ]]; then if [[ -d $TESTDIR ]]; then
ismounted $TESTDIR ismounted $TESTDIR && log_must umount $TESTDIR
(( $? == 0 )) && \
log_must $UNMOUNT $TESTDIR
log_must rm -rf $TESTDIR log_must rm -rf $TESTDIR
fi fi

View File

@ -58,9 +58,9 @@ log_must touch $TESTDIR/myfile.$$
create_xattr $TESTDIR/myfile.$$ passwd /etc/passwd create_xattr $TESTDIR/myfile.$$ passwd /etc/passwd
# Try to create a soft link from the xattr namespace to the default namespace # Try to create a soft link from the xattr namespace to the default namespace
log_mustnot runat $TESTDIR/myfile.$$ $LN -s /etc/passwd foo log_mustnot runat $TESTDIR/myfile.$$ ln -s /etc/passwd foo
# Try to create a hard link from the xattr namespace to the default namespace # Try to create a hard link from the xattr namespace to the default namespace
log_mustnot runat $TESTDIR/myfile.$$ $LN /etc/passwd foo log_mustnot runat $TESTDIR/myfile.$$ ln /etc/passwd foo
log_pass "links between xattr and normal file namespace fail" log_pass "links between xattr and normal file namespace fail"

View File

@ -77,14 +77,13 @@ typeset -i fn=0
typeset -i retval=0 typeset -i retval=0
while (( 1 )); do while (( 1 )); do
file_write -o create -f $TESTDIR/testfile$$.$fn \ file_write -o create -f $TESTDIR/testfile$$.$fn \
-b $BLOCKSZ -c $NUM_WRITES -b $BLOCKSZ -c $NUM_WRITES
retval=$? retval=$?
if (( $retval != 0 )); then if (( $retval != 0 )); then
break break
fi fi
(( fn = fn + 1 ))
(( fn = fn + 1 ))
done done
if is_linux; then if is_linux; then