xfsqa 185 shouldn't have uninitialised variables in the golden output

Kill the output of uninitialised values when punching a hole.
This prevents the test from passing on just about everything.
Merge of master-melb:xfs-cmds:30762a by kenmcd.

  remove roffp and rlenp output for punch operations.

diff --git a/185.out b/185.out
index fa746d341ca4704596f7b43439c0a02a446a5204..9fdbfca26435d6ecc5a9144882a904c0690e7740 100644 (file)
--- a/185.out
+++ b/185.out
@@ -12,7 +12,6 @@ roffp is 0, rlenp is 16384
 Method:        dmapi_punch
 Running DMAPI punch hole on /mnt/scratch/dmapi/holly_file with settings:
   offset = '0', length = '16384', sid = '0'
 Method:        dmapi_punch
 Running DMAPI punch hole on /mnt/scratch/dmapi/holly_file with settings:
   offset = '0', length = '16384', sid = '0'

-roffp is 4200149, rlenp is 47820330485640

 =======================================================
 =======================================================
 Testing with length = 1k, offset = 0
 =======================================================
 =======================================================
 Testing with length = 1k, offset = 0


@@ -27,7 +26,6 @@ roffp is 0, rlenp is 1024
 Method:        dmapi_punch
 Running DMAPI punch hole on /mnt/scratch/dmapi/holly_file with settings:
   offset = '0', length = '1024', sid = '0'
 Method:        dmapi_punch
 Running DMAPI punch hole on /mnt/scratch/dmapi/holly_file with settings:
   offset = '0', length = '1024', sid = '0'

-roffp is 4200149, rlenp is 47194545715080

 =======================================================
 =======================================================
 Testing with length = 1k, offset = 4k
 =======================================================
 =======================================================
 Testing with length = 1k, offset = 4k


@@ -42,7 +40,6 @@ roffp is 4096, rlenp is 1024
 Method:        dmapi_punch
 Running DMAPI punch hole on /mnt/scratch/dmapi/holly_file with settings:
   offset = '4096', length = '1024', sid = '0'
 Method:        dmapi_punch
 Running DMAPI punch hole on /mnt/scratch/dmapi/holly_file with settings:
   offset = '4096', length = '1024', sid = '0'

-roffp is 4200149, rlenp is 47256598480776

 =======================================================
 =======================================================
 Testing with length = 4k, offset = 1k
 =======================================================
 =======================================================
 Testing with length = 4k, offset = 1k


@@ -57,7 +54,6 @@ roffp is 1024, rlenp is 4096
 Method:        dmapi_punch
 Running DMAPI punch hole on /mnt/scratch/dmapi/holly_file with settings:
   offset = '1024', length = '4096', sid = '0'
 Method:        dmapi_punch
 Running DMAPI punch hole on /mnt/scratch/dmapi/holly_file with settings:
   offset = '1024', length = '4096', sid = '0'

-roffp is 4200149, rlenp is 47292581427080

 =======================================================
 =======================================================
 Testing with length = 1024k, offset = 512k
 =======================================================
 =======================================================
 Testing with length = 1024k, offset = 512k


@@ -72,5 +68,4 @@ roffp is 524288, rlenp is 1048576
 Method:        dmapi_punch
 Running DMAPI punch hole on /mnt/scratch/dmapi/holly_file with settings:
   offset = '524288', length = '1048576', sid = '0'
 Method:        dmapi_punch
 Running DMAPI punch hole on /mnt/scratch/dmapi/holly_file with settings:
   offset = '524288', length = '1048576', sid = '0'

-roffp is 4200149, rlenp is 47016592795528

 =======================================================
 =======================================================

diff --git a/dmapi/src/suite1/cmd/probe_punch_xfsctl_hole.c b/dmapi/src/suite1/cmd/probe_punch_xfsctl_hole.c
index 50fc7f4b08c5a5bd7c4d889da89dec28b0c4e00b..effa98a45a2fe8a74593c0eba8c31aa8b1af4ee2 100644 (file)
--- a/dmapi/src/suite1/cmd/probe_punch_xfsctl_hole.c
+++ b/dmapi/src/suite1/cmd/probe_punch_xfsctl_hole.c
@@ -176,6 +176,7 @@ main(
                                strerror(errno));
                        exit(1);
                }
                                strerror(errno));
                        exit(1);
                }

+               fprintf(stdout, "roffp is %lld, rlenp is %lld\n", roffp, rlenp);

                break;
        case METHOD_DMAPI_PUNCH:
                if (dm_punch_hole(sid, hanp, hlen, DM_NO_TOKEN, offset, length)) {
                break;
        case METHOD_DMAPI_PUNCH:
                if (dm_punch_hole(sid, hanp, hlen, DM_NO_TOKEN, offset, length)) {


@@ -185,7 +186,6 @@ main(
                }
                break;                  
        }
                }
                break;                  
        }

-       fprintf(stdout, "roffp is %lld, rlenp is %lld\n", roffp, rlenp);

        dm_handle_free(hanp, hlen);
        
        return 0;
        dm_handle_free(hanp, hlen);
        
        return 0;