git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
include
/
linux
/
vserver
/
inode.h
diff --git
a/include/linux/vserver/inode.h
b/include/linux/vserver/inode.h
index
e19632d
..
aa8852f
100644
(file)
--- a/
include/linux/vserver/inode.h
+++ b/
include/linux/vserver/inode.h
@@
-39,7
+39,7
@@
struct vcmd_ctx_iattr_v1 {
#define IATTR_IMMUTABLE 0x00040000
#define IATTR_IMMUTABLE 0x00040000
-#ifdef CONFIG_
VSERVER_
PROC_SECURE
+#ifdef CONFIG_PROC_SECURE
#define IATTR_PROC_DEFAULT ( IATTR_ADMIN | IATTR_HIDE )
#define IATTR_PROC_SYMLINK ( IATTR_ADMIN )
#else
#define IATTR_PROC_DEFAULT ( IATTR_ADMIN | IATTR_HIDE )
#define IATTR_PROC_SYMLINK ( IATTR_ADMIN )
#else
@@
-57,10
+57,6
@@
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_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 */
#endif /* __KERNEL__ */
/* inode ioctls */
@@
-68,7
+64,4
@@
extern int vc_iattr_ioctl(struct dentry *de,
#define FIOC_GETXFLG _IOR('x', 5, long)
#define FIOC_SETXFLG _IOW('x', 6, long)
#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)
-
#endif /* _VX_INODE_H */
#endif /* _VX_INODE_H */