- sync vserver and fedora branches

- mostly inconsequential whitespace change, but will help future merges
  of both

diff --git a/fs/exec.c b/fs/exec.c
index ac3f2ac..f1e7e72 100644 (file)
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -47,7 +47,6 @@
 #include <linux/security.h>
 #include <linux/syscalls.h>
 #include <linux/rmap.h>
-#include <linux/vs_memory.h>
 #include <linux/acct.h>
 #include <linux/vs_memory.h>
 
@@ -761,11 +760,14 @@ no_thread_group:
                atomic_set(&newsighand->count, 1);
                memcpy(newsighand->action, oldsighand->action,
                       sizeof(newsighand->action));
+
                write_lock_irq(&tasklist_lock);
                spin_lock(&oldsighand->siglock);
                spin_lock(&newsighand->siglock);
+
                current->sighand = newsighand;
                recalc_sigpending();
+
                spin_unlock(&newsighand->siglock);
                spin_unlock(&oldsighand->siglock);
                write_unlock_irq(&tasklist_lock);

diff --git a/fs/inode.c b/fs/inode.c
index 4fb853b..8c983e9 100644 (file)
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -21,7 +21,6 @@
 #include <linux/pagemap.h>
 #include <linux/cdev.h>
 #include <linux/bootmem.h>
-#include <linux/vs_base.h>
 
 /*
  * This is needed for the following functions: