1 files changed, 5 insertions, 9 deletions

diff --git a/litmus/locking.c b/litmus/locking.c
index c6eda968411f..d347fdce4cb7 100644
--- a/litmus/locking.c
+++ b/litmus/locking.c
@@ -69,9 +69,8 @@ static  int create_generic_lock(void** obj_ref, obj_type_t type, void* __user ar
 
                 TRACE_CUR("Lock %d (%p) created. Type = %d\n.", lock->ident, lock, type);
 
-                if (lock->proc && lock->proc->add) {
+                if (lock->proc && lock->proc->add)
                         lock->proc->add(lock);
-                }
     }
         return err;
 }
@@ -89,11 +88,6 @@ static int close_generic_lock(struct od_table_entry* entry)
 {
         struct litmus_lock* lock = get_lock(entry);
         if (lock->ops->close) {
-
-                if (lock->proc && lock->proc->remove) {
-                        lock->proc->remove(lock);
-                }
-
                 return lock->ops->close(lock);
         }
         else
@@ -103,6 +97,10 @@ static int close_generic_lock(struct od_table_entry* entry)
 static void destroy_generic_lock(obj_type_t type, void* obj)
 {
         struct litmus_lock* lock = (struct litmus_lock*) obj;
+
+        if (lock->proc && lock->proc->remove)
+                lock->proc->remove(lock);
+
         lock->ops->deallocate(lock);
 }
 
@@ -121,7 +119,6 @@ asmlinkage long sys_litmus_lock(int lock_od)
         entry = get_entry_for_od(lock_od);
         if (entry && is_lock(entry)) {
                 l = get_lock(entry);
-                //TRACE_CUR("attempts to lock 0x%p\n", l);
                 TRACE_CUR("Attempts to lock %d\n", l->ident);
                 err = l->ops->lock(l);
                 if (!err) {
@@ -155,7 +152,6 @@ asmlinkage long sys_litmus_unlock(int lock_od)
         entry = get_entry_for_od(lock_od);
         if (entry && is_lock(entry)) {
                 l = get_lock(entry);
-                //TRACE_CUR("attempts to unlock 0x%p\n", l);
                 TRACE_CUR("Attempts to unlock %d\n", l->ident);
                 err = l->ops->unlock(l);
                 if (!err) {