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
vserver 1.9.3
[linux-2.6.git]
/
fs
/
ioctl.c
diff --git
a/fs/ioctl.c
b/fs/ioctl.c
index
64ffa90
..
c4d38f6
100644
(file)
--- a/
fs/ioctl.c
+++ b/
fs/ioctl.c
@@
-18,7
+18,7
@@
#include <asm/uaccess.h>
#include <asm/ioctls.h>
#include <asm/uaccess.h>
#include <asm/ioctls.h>
-#ifdef CONFIG_VSERVER_LEGACY
+#ifdef CONFIG_VSERVER_LEGACY
extern int vx_proc_ioctl(struct inode *, struct file *,
unsigned int, unsigned long);
#endif
extern int vx_proc_ioctl(struct inode *, struct file *,
unsigned int, unsigned long);
#endif
@@
-130,7
+130,7
@@
asmlinkage long sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)
else
error = -ENOTTY;
break;
else
error = -ENOTTY;
break;
-#ifdef CONFIG_VSERVER_LEGACY
+#ifdef CONFIG_VSERVER_LEGACY
#ifndef CONFIG_INOXID_NONE
case FIOC_GETXID: {
struct inode *inode = filp->f_dentry->d_inode;
#ifndef CONFIG_INOXID_NONE
case FIOC_GETXID: {
struct inode *inode = filp->f_dentry->d_inode;
@@
-162,7
+162,7
@@
asmlinkage long sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)
inode->i_xid = (xid & 0xFFFF);
inode->i_ctime = CURRENT_TIME;
mark_inode_dirty(inode);
inode->i_xid = (xid & 0xFFFF);
inode->i_ctime = CURRENT_TIME;
mark_inode_dirty(inode);
- break;
+ break;
}
#endif
case FIOC_GETXFLG:
}
#endif
case FIOC_GETXFLG: