X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fdevpts%2Finode.c;h=64301076ebaa2e31b34f95a3758153bf752c0857;hb=97bf2856c6014879bd04983a3e9dfcdac1e7fe85;hp=b44d79196246b68356cbc7b1bc0a78e9861af847;hpb=16c70f8c1b54b61c3b951b6fb220df250fe09b32;p=linux-2.6.git

diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
index b44d79196..64301076e 100644
--- a/fs/devpts/inode.c
+++ b/fs/devpts/inode.c
@@ -19,13 +19,15 @@
 #include <linux/tty.h>
 #include <linux/devpts_fs.h>
 #include <linux/parser.h>
+#include <linux/vs_base.h>
 
 
 static int devpts_permission(struct inode *inode, int mask, struct nameidata *nd)
 {
 	int ret = -EACCES;
 
-	if (vx_check(inode->i_xid, VX_IDENT))
+	/* devpts is xid tagged */
+	if (vx_check((xid_t)inode->i_tag, VS_WATCH_P|VS_IDENT))
 		ret = generic_permission(inode, mask, NULL);
 	return ret;
 }
@@ -105,7 +107,8 @@ static int devpts_remount(struct super_block *sb, int *flags, char *data)
 
 static int devpts_filter(struct dentry *de)
 {
-	return vx_check(de->d_inode->i_xid, VX_IDENT);
+	/* devpts is xid tagged */
+	return vx_check((xid_t)de->d_inode->i_tag, VS_WATCH_P|VS_IDENT);
 }
 
 static int devpts_readdir(struct file * filp, void * dirent, filldir_t filldir)
@@ -148,7 +151,8 @@ devpts_fill_super(struct super_block *s, void *data, int silent)
 	inode->i_op = &simple_dir_inode_operations;
 	inode->i_fop = &devpts_dir_operations;
 	inode->i_nlink = 2;
-	inode->i_xid = vx_current_xid();
+	/* devpts is xid tagged */
+	inode->i_tag = (tag_t)vx_current_xid();
 
 	devpts_root = s->s_root = d_alloc_root(inode);
 	if (s->s_root)
@@ -206,7 +210,8 @@ int devpts_pty_new(struct tty_struct *tty)
 	inode->i_gid = config.setgid ? config.gid : current->fsgid;
 	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
 	init_special_inode(inode, S_IFCHR|config.mode, device);
-	inode->i_xid = vx_current_xid();
+	/* devpts is xid tagged */
+	inode->i_tag = (tag_t)vx_current_xid();
 	inode->i_op = &devpts_file_inode_operations;
 	inode->i_private = tty;