check +#ifdef CONFIG_INOXID_INTERN <--------------- + raw_inode->i_raw_xid = cpu_to_le16(inode->i_xid); +#endif +#ifndef CONFIG_INOXID_NONE <----------------- + case Opt_tagxid: + set_opt (sbi->s_mount_opt, TAG_XID); + break; +#endif + if ((attr->ia_valid & ATTR_XID) + && inode->i_sb + && (inode->i_sb->s_flags & MS_TAGXID)) <---- + inode->i_xid = attr->ia_xid; --- linux-2.6.12.2/fs/ext3/namei.c 2005-03-02 12:38:44 +0100 +++ linux-2.6.12.2-vs2.0-rc6.1/fs/ext3/namei.c 2005-07-02 22:38:30 +0200 @@ -994,6 +995,7 @@ static struct dentry *ext3_lookup(struct if (!inode) return ERR_PTR(-EACCES); + vx_propagate_xid(nd, inode); <--------------- } if (inode) return d_splice_alias(inode, dentry); +#ifndef CONFIG_INOXID_NONE + case Opt_tagxid: + if (is_remount) { <-------------- + printk(KERN_ERR "EXT3-fs: cannot specify " + "tagxid on remount\n"); + return 0; + } + set_opt (sbi->s_mount_opt, TAG_XID); + break; +#endif /* duplicate check? - if (security_vm_enough_memory((newbrk-oldbrk) >> PAGE_SHIFT)) { + if (security_vm_enough_memory((newbrk-oldbrk) >> PAGE_SHIFT) || <--- + !vx_vmpages_avail(mm, (newbrk-oldbrk) >> PAGE_SHIFT)) { + /* check against file xid maybe ? */ + fl->fl_xid = vx_current_xid(); + vx_locks_inc(fl); --- linux-2.6.12.2/fs/nfs/inode.c 2005-06-22 02:38:37 +0200 +++ linux-2.6.12.2-vs2.0-rc6.1/fs/nfs/inode.c 2005-07-02 22:38:30 +0200 @@ -740,7 +749,12 @@ nfs_fhget(struct super_block *sb, struct out: return inode; - +/* FIXME +fail_dlim: + make_bad_inode(inode); + iput(inode); + inode = NULL; +*/ out_no_inode: printk("nfs_fhget: iget failed\n"); goto out;