From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Sat, 20 Aug 2005 19:10:55 +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~148
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a1020f885dc7911548c0bccb6823baf79e34f25c;p=linux-2.6.git

- sync vserver branch:  will help future merges
- remove deprecated iattr() syscalls
---

diff --git a/include/linux/vserver/inode.h b/include/linux/vserver/inode.h
index e1a0bc7c3..9f5cb2d76 100644
--- a/include/linux/vserver/inode.h
+++ b/include/linux/vserver/inode.h
@@ -1,6 +1,7 @@
 #ifndef _VX_INODE_H
 #define _VX_INODE_H
 
+
 #define IATTR_XID	0x01000000
 
 #define IATTR_ADMIN	0x00000001
@@ -28,21 +29,17 @@
 
 #define vx_hide_check(c,m)	(((m) & IATTR_HIDE) ? vx_check(c,m) : 1)
 
-extern int vc_get_iattr_v0(uint32_t, void __user *);
-extern int vc_set_iattr_v0(uint32_t, void __user *);
-
-extern int vc_get_iattr(uint32_t, void __user *);
-extern int vc_set_iattr(uint32_t, void __user *);
-
 extern int vc_iattr_ioctl(struct dentry *de,
 			  unsigned int cmd,
 			  unsigned long arg);
+
 #endif	/* __KERNEL__ */
 
 /* inode ioctls */
 
 #define FIOC_GETXFLG	_IOR('x', 5, long)
 #define FIOC_SETXFLG	_IOW('x', 6, long)
+
 #define FIOC_GETIATTR   _IOR('x', 7, long)
 #define FIOC_SETIATTR   _IOR('x', 8, long)