1 files changed, 33 insertions, 24 deletions

diff --git a/litmus/locking.c b/litmus/locking.c
index e0e6c1dc6256..348a4be97cf9 100644
--- a/litmus/locking.c
+++ b/litmus/locking.c
@@ -68,7 +68,7 @@ static void destroy_generic_lock(obj_type_t type, void* obj)
         lock->ops->deallocate(lock);
 }
 
-bool check_mask_valid(resource_mask_t mask)
+bool check_mask_valid(struct litmus_lock* l, resource_mask_t mask)
 {
     // this should really check if all of the resources requested are
     // controlled by the dynamic group lock. this can be done with bitwise
@@ -76,35 +76,48 @@ bool check_mask_valid(resource_mask_t mask)
     return true;
 }
 
-asmlinkage long sys_dynamic_group_lock(int mask)
+asmlinkage long sys_dynamic_group_lock(resource_mask_t lock_ods)
 {
-    //long err = -EINVAL;
+    long err = -EINVAL;
+    struct od_table_entry* entry;
+    struct litmus_lock* l;
 
-    //TS_LOCK_START;
+    TS_LOCK_START;
 
-    //TS_LOCK_END;
+    entry = get_entry_for_od(ffs(lock_ods)-1);
+    if (entry && is_lock(entry)) {
+        l = get_lock(entry);
+        if (check_mask_valid(l, mask)){
+            TRACE_CUR("attempts to lock %d\n", lock_ods);
+            err = l->ops->dynamic_group_lock(l, lock_ods);
+        }
+    }
 
-    //return err;
+    TS_LOCK_END;
 
-    TRACE("Successfully called the dynamic group lock system call");
-    printk(KERN_INFO "printk: Successfully called the dynamic group lock system call");
-    return -EINVAL;
+    return err;
 }
 
 asmlinkage long sys_dynamic_group_unlock(resource_mask_t lock_ods)
 {
-    return 0;
-}
+    long err = -EINVAL;
+    struct od_table_entry* entry;
+    struct litmus_lock* l;
 
-/*
- * Point the new_od to the existing dynamic_group_lock pointed to in the entry
- * for dgl_od. In so doing, update the metadata for the dgl so the masks are
- * correct.
- */
-asmlinkage long sys_dynamic_group_add(int dgl_od, int new_od)
-{
-//    long err = -EINVAL;
-    return 0;
+    TS_UNLOCK_START;
+
+    entry = get_entry_for_od(ffs(lock_ods)-1);
+    if (entry && is_lock(entry)) {
+        l = get_lock(entry);
+        if (check_mask_valid(l, mask)){
+            TRACE_CUR("attempts to unlock all resources in 0x%p\n",l);
+            err = l->ops->dynamic_group_unlock(l, lock_ods);
+        }
+    }
+
+    TS_UNLOCK_END;
+
+    return err;
 }
 
 asmlinkage long sys_litmus_lock(int lock_od)
@@ -113,10 +126,6 @@ asmlinkage long sys_litmus_lock(int lock_od)
         struct od_table_entry* entry;
         struct litmus_lock* l;
 
-        TS_SYSCALL_IN_START;
-
-        TS_SYSCALL_IN_END;
-
         TS_LOCK_START;
 
         entry = get_entry_for_od(lock_od);