From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Sat, 20 Aug 2005 18:32:15 +0000 (+0000)
Subject: - sync vserver branch:  will help future merges
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~156
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f5d84ae99b52c73cb7f802b568baa83216f34846;p=linux-2.6.git

- sync vserver branch:  will help future merges
---

diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
index 055bbccbf..836d50bc0 100644
--- 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 cec512d6f..25f4a64fd 100644
--- 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 c02730096..638c13a26 100644
--- 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 a46003587..555c15d8e 100644
--- 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>