[ported from 2008.3] Add File Descriptor Attached Shared Objects (FDSO) infrastructure

2 files changed, 10 insertions, 5 deletions

diff --git a/fs/exec.c b/fs/exec.c
index ba112bd4a339..606cf96828d5 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -19,7 +19,7 @@
  * current->executable is only used by the procfs.  This allows a dispatch
  * table to check for several different types  of binary formats.  We keep
  * trying until we recognize the file or we run out of supported binary
- * formats. 
+ * formats.
  */
 
 #include <linux/slab.h>
@@ -57,6 +57,8 @@
 #include <linux/fs_struct.h>
 #include <linux/pipe_fs_i.h>
 
+#include <litmus/litmus.h>
+
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>
 #include <asm/tlb.h>
@@ -80,7 +82,7 @@ int __register_binfmt(struct linux_binfmt * fmt, int insert)
         insert ? list_add(&fmt->lh, &formats) :
                  list_add_tail(&fmt->lh, &formats);
         write_unlock(&binfmt_lock);
-        return 0;       
+        return 0;
 }
 
 EXPORT_SYMBOL(__register_binfmt);
@@ -1006,7 +1008,7 @@ int flush_old_exec(struct linux_binprm * bprm)
            group */
 
         current->self_exec_id++;
-                        
+
         flush_signal_handlers(current, 0);
         flush_old_files(current->files);
 
@@ -1102,8 +1104,8 @@ int check_unsafe_exec(struct linux_binprm *bprm)
         return res;
 }
 
-/* 
- * Fill the binprm structure from the inode. 
+/*
+ * Fill the binprm structure from the inode.
  * Check permissions, then read the first 128 (BINPRM_BUF_SIZE) bytes
  *
  * This may be called multiple times for binary chains (scripts for example).
@@ -1318,6 +1320,7 @@ int do_execve(char * filename,
                 goto out_unmark;
 
         sched_exec();
+        litmus_exec();
 
         bprm->file = file;
         bprm->filename = filename;
diff --git a/fs/inode.c b/fs/inode.c
index 4d8e3be55976..de80bc2bf713 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -282,6 +282,8 @@ void inode_init_once(struct inode *inode)
 #ifdef CONFIG_FSNOTIFY
         INIT_HLIST_HEAD(&inode->i_fsnotify_mark_entries);
 #endif
+        INIT_LIST_HEAD(&inode->i_obj_list);
+        mutex_init(&inode->i_obj_mutex);
 }
 EXPORT_SYMBOL(inode_init_once);