FDSO: make sure fdso_close() is called during task teardown

When a task exists and its FDSO table is released, the locking
protocol's 'close()' callback should be invoked to do proper
protocol-specific cleanup (such as unlocking the resource, if
required).

1 files changed, 14 insertions, 6 deletions

diff --git a/litmus/fdso.c b/litmus/fdso.c
index cd85b9cd9a0a..250377d184e7 100644
--- a/litmus/fdso.c
+++ b/litmus/fdso.c
@@ -166,6 +166,18 @@ static int put_od_entry(struct od_table_entry* od)
         return 0;
 }
 
+static long close_od_entry(struct od_table_entry *od)
+{
+        long ret;
+
+        /* Give the class a chance to reject the close. */
+        ret = fdso_close(od);
+        if (ret == 0)
+                ret = put_od_entry(od);
+
+        return ret;
+}
+
 void exit_od_table(struct task_struct* t)
 {
         int i;
@@ -173,7 +185,7 @@ void exit_od_table(struct task_struct* t)
         if (t->od_table) {
                 for (i = 0; i < MAX_OBJECT_DESCRIPTORS; i++)
                         if (t->od_table[i].used)
-                                put_od_entry(t->od_table + i);
+                                close_od_entry(t->od_table + i);
                 kfree(t->od_table);
                 t->od_table = NULL;
         }
@@ -287,11 +299,7 @@ asmlinkage long sys_od_close(int od)
                 return ret;
 
 
-        /* give the class a chance to reject the close
-         */
-        ret = fdso_close(t->od_table + od);
-        if (ret == 0)
-                ret = put_od_entry(t->od_table + od);
+        ret = close_od_entry(t->od_table + od);
 
         return ret;
 }