- sync vserver branch: will help future merges

diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
index 055bbcc..836d50b 100644 (file)
--- a/fs/devpts/inode.c
+++ b/fs/devpts/inode.c
@@ -18,7 +18,6 @@
 #include <linux/mount.h>
 #include <linux/tty.h>
 #include <linux/devpts_fs.h>
-#include <linux/vs_base.h>
 #include <linux/xattr.h>
 
 extern struct xattr_handler devpts_xattr_security_handler;

diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c
index cec512d..25f4a64 100644 (file)
--- a/fs/ext2/acl.c
+++ b/fs/ext2/acl.c
@@ -8,8 +8,6 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/fs.h>
-#include <linux/namei.h> 
-#include <linux/vs_base.h>
 #include "ext2.h"
 #include "xattr.h"
 #include "acl.h"

diff --git a/fs/ext3/acl.c b/fs/ext3/acl.c
index c027300..638c13a 100644 (file)
--- a/fs/ext3/acl.c
+++ b/fs/ext3/acl.c
@@ -8,10 +8,8 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/fs.h>
-#include <linux/namei.h> 
 #include <linux/ext3_jbd.h>
 #include <linux/ext3_fs.h>
-#include <linux/vs_base.h>
 #include "xattr.h"
 #include "acl.h"
 

diff --git a/fs/ext3/ialloc.c b/fs/ext3/ialloc.c
index a460035..555c15d 100644 (file)
--- a/fs/ext3/ialloc.c
+++ b/fs/ext3/ialloc.c
@@ -22,7 +22,6 @@
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
 #include <linux/random.h>
-#include <linux/vs_dlimit.h>
 #include <linux/bitops.h>
 #include <linux/vs_dlimit.h>
 #include <linux/vserver/xid.h>