Branch: HEAD

1) add mks type in sanity-crypto.sh
2) fix decrypt problem in mks type

diff --git a/lustre/llite/llite_gs.c b/lustre/llite/llite_gs.c
index 7fe1804..b97366e 100644 (file)
--- a/lustre/llite/llite_gs.c
+++ b/lustre/llite/llite_gs.c
@@ -652,6 +652,7 @@ int ll_mks_decrypt_key(struct inode *inode, struct lookup_intent *it)
                 GOTO(out, rc);      
         spin_lock(&lli->lli_lock); 
         SET_DECRYPTED(lkey->lk_flags); 
+        memcpy(&lkey->lk_dk, lkey->lk_ck.ck_key, KEY_SIZE);
         spin_unlock(&lli->lli_lock);
         EXIT;
 out:

diff --git a/lustre/tests/sanity-crypto.sh b/lustre/tests/sanity-crypto.sh
index fbfca4e..ade5a6c 100755 (executable)
--- a/lustre/tests/sanity-crypto.sh
+++ b/lustre/tests/sanity-crypto.sh
@@ -51,8 +51,13 @@ gen_config() {
     fi
     add_ost ost --lov lov1 --dev $OSTDEV --size $OSTSIZE
     add_ost ost2 --lov lov1 --dev ${OSTDEV}-2 --size $OSTSIZE
-    add_gks gks     
-    add_client client $MDS --lov lov1 --gks gks_svc --path $MOUNT
+    if [ $CRYPT_TYPE == "gks" ]; then 
+       add_gks gks     
+       add_client client $MDS --lov lov1 --gks gks_svc --path $MOUNT
+    else
+       add_client client $MDS --lov lov1 --path $MOUNT
+    fi
+       
 }
 
 build_test_filter
@@ -68,8 +73,9 @@ cleanup() {
     umount $MOUNT2 || true
     umount $MOUNT || true
     rmmod llite
-
-    stop_gks gks 
+    if [ $CRYPT_TYPE == "gks" ]; then
+       stop_gks gks 
+    fi
     for mds in `mds_list`; do
        stop $mds ${FORCE} $MDSLCONFARGS
     done
@@ -98,9 +104,9 @@ setup() {
     for mds in `mds_list`; do
        start $mds --reformat $MDSLCONFARGS
     done
-    set -vx 
-    start_gks gks || exit 4
-    set -e
+    if [ $CRYPT_TYPE == "gks" ]; then
+       start_gks gks || exit 4
+    fi
     grep " $MOUNT " /proc/mounts || zconf_mount `hostname` $MOUNT
     grep " $MOUNT2 " /proc/mounts || zconf_mount `hostname` $MOUNT2
 }