Add fixes from Takayuki Sasaki <sasaki@bsd.tnes.nec.co.jp>

[xfstests-dev.git] / dmapi / src / sample_hsm / wbee.c

diff --git a/dmapi/src/sample_hsm/wbee.c b/dmapi/src/sample_hsm/wbee.c
index 07b7a0c58739366171be85476051bfed8858a5c3..968395574727a3eb4b2717af87819caa64c593eb 100644 (file)
--- a/dmapi/src/sample_hsm/wbee.c
+++ b/dmapi/src/sample_hsm/wbee.c
@@ -245,7 +245,7 @@ check_lockstate(
                errno_msg("Can't query file access rights");
                return(1);
        }
-#ifdef __sgi
+#if defined(__sgi) || defined(linux)
        /*
         * There are no access rights on the SGI. 1 means it's
         * there.
@@ -453,7 +453,7 @@ clear_mrgns(
        size_t           hlen, 
        dm_token_t       token)
 {
-       dm_region_t     *rgn;
+       dm_region_t     *rgn, *sv_rgn;
        u_int            nregions, nret;
        u_int            exact_flag;
        int              i;
@@ -502,6 +502,8 @@ clear_mrgns(
                }
        }
 
+       sv_rgn = rgn;
+
        /*
         * Clear all the managed regions
         */
@@ -511,6 +513,8 @@ clear_mrgns(
                rgn->rg_flags  = DM_REGION_NOEVENT;
                rgn++;
        }
+       rgn = sv_rgn;
+
        error = dm_set_region(sid, hanp, hlen, token, nregions, rgn, 
                                &exact_flag);
        if (error == -1) {