Unionfs ODF regression: Import changes to mknod from unionfs regression

Signed-off-by: Rachita Kothiyal <rachita@fsl.cs.sunysb.edu>

diff --git a/t-mknod.sh b/t-mknod.sh
index 4aae65303caea85f72c0228c4c62459a30029ca5..fee48d9c899e094c7a0fd64d3495462e591439a7 100755 (executable)
--- a/t-mknod.sh
+++ b/t-mknod.sh
@@ -31,6 +31,7 @@ FILES
 function beforefiles {
 cat <<FILES
 w $LOWER_DIR1 d1/d2/d3/d4/c
+c $LOWER_DIR1/devnull
 FILES
 }
 
@@ -38,23 +39,18 @@ FILES
 function afterfiles_rw {
 cat <<FILES
 b $LOWER_DIR0/a
-
-FILES
-if [ $ODF -eq 0 ]; then
-cat <<FILES
-c $LOWER_DIR1/d5/b
-
-b $LOWER_DIR1/d1/d2/d3/d4/c
-FILES
-else
-cat <<FILES
 d $LOWER_DIR0/d5
 c $LOWER_DIR0/d5/b
 d $LOWER_DIR0/d1/d2
 d $LOWER_DIR0/d1/d2/d3
 d $LOWER_DIR0/d1/d2/d3/d4
 b $LOWER_DIR0/d1/d2/d3/d4/c
+c $LOWER_DIR1/devnull
+FILES
 
+if [ $ODF -eq 0 ]; then
+cat <<FILES
+w $LOWER_DIR1 d1/d2/d3/d4/c
 FILES
 fi
 
@@ -71,6 +67,8 @@ d $LOWER_DIR0/d1/d2
 d $LOWER_DIR0/d1/d2/d3
 d $LOWER_DIR0/d1/d2/d3/d4
 b $LOWER_DIR0/d1/d2/d3/d4/c
+c $LOWER_DIR0/devnull
+c $LOWER_DIR1/devnull
 FILES
 if [ $ODF -eq 0 ]; then
 cat <<FILES
@@ -79,6 +77,7 @@ FILES
 fi
 }
 
+function test_rw {
 init_odf $LOWER_DIR0 $LOWER_DIR1
 ( directories ; beforefiles) | create_hierarchy
 mount_union "" $LOWER_DIR0 $LOWER_DIR1
@@ -90,11 +89,19 @@ checktype "$MOUNTPOINT/d5/b" 'c'
 mknod $MOUNTPOINT/d1/d2/d3/d4/c  b  200 0
 checktype "$MOUNTPOINT/d1/d2/d3/d4/c" 'b'
 
+checkperms $MOUNTPOINT/devnull 644
+chmod 666 $MOUNTPOINT/devnull
+echo > $MOUNTPOINT/devnull
+checkperms $MOUNTPOINT/devnull 666
+
 unmount_union
 ( directories ; afterfiles_rw )  | check_hierarchy
 discard_odf
+echo -n "[rw] "
+}
 
 
+function test_ro {
 init_odf $LOWER_DIR0 $LOWER_DIR1=ro
 ( directories ; beforefiles) | create_hierarchy
 mount_union "" $LOWER_DIR0 $LOWER_DIR1=ro
@@ -106,8 +113,17 @@ checktype "$MOUNTPOINT/d5/b" 'c'
 mknod $MOUNTPOINT/d1/d2/d3/d4/c   b  200 0
 checktype "$MOUNTPOINT/d1/d2/d3/d4/c" 'b'
 
+checkperms $MOUNTPOINT/devnull 644
+chmod 666 $MOUNTPOINT/devnull
+echo > $MOUNTPOINT/devnull
+checkperms $MOUNTPOINT/devnull 666
+
 unmount_union
 ( directories ; afterfiles_ro )  | check_hierarchy
 discard_odf
+echo -n "[ro] "
+}
 
+test_rw
+test_ro
 complete_test