X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fext2%2Finode.c;h=31f20527bfe13437b4324ef79f3627de447e7141;hb=refs%2Fheads%2Fvserver;hp=2f0c404f04fa7d5473db0f0d14c13e41ea2028aa;hpb=16c70f8c1b54b61c3b951b6fb220df250fe09b32;p=linux-2.6.git

diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 2f0c404f0..31f20527b 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -31,7 +31,7 @@
 #include <linux/writeback.h>
 #include <linux/buffer_head.h>
 #include <linux/mpage.h>
-#include <linux/vserver/xid.h>
+#include <linux/vs_tag.h>
 #include "ext2.h"
 #include "acl.h"
 #include "xip.h"
@@ -1068,13 +1068,9 @@ int ext2_sync_flags(struct inode *inode)
 	unsigned int oldflags, newflags;
 
 	oldflags = EXT2_I(inode)->i_flags;
-	newflags = oldflags & ~(EXT2_APPEND_FL |
-		EXT2_IMMUTABLE_FL | EXT2_IUNLINK_FL |
-		EXT2_BARRIER_FL | EXT2_NOATIME_FL |
-		EXT2_SYNC_FL | EXT2_DIRSYNC_FL);
+	newflags = oldflags & ~(EXT2_IMMUTABLE_FL |
+		EXT2_IUNLINK_FL | EXT2_BARRIER_FL);
 
-	if (IS_APPEND(inode))
-		newflags |= EXT2_APPEND_FL;
 	if (IS_IMMUTABLE(inode))
 		newflags |= EXT2_IMMUTABLE_FL;
 	if (IS_IUNLINK(inode))
@@ -1082,20 +1078,11 @@ int ext2_sync_flags(struct inode *inode)
 	if (IS_BARRIER(inode))
 		newflags |= EXT2_BARRIER_FL;
 
-	/* we do not want to copy superblock flags */
-	if (inode->i_flags & S_NOATIME)
-		newflags |= EXT2_NOATIME_FL;
-	if (inode->i_flags & S_SYNC)
-		newflags |= EXT2_SYNC_FL;
-	if (inode->i_flags & S_DIRSYNC)
-		newflags |= EXT2_DIRSYNC_FL;
-
 	if (oldflags ^ newflags) {
 		EXT2_I(inode)->i_flags = newflags;
 		inode->i_ctime = CURRENT_TIME;
 		mark_inode_dirty(inode);
 	}
-
 	return 0;
 }
 
@@ -1123,10 +1110,10 @@ void ext2_read_inode (struct inode * inode)
 		uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
 		gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
 	}
-	inode->i_uid = INOXID_UID(XID_TAG(inode), uid, gid);
-	inode->i_gid = INOXID_GID(XID_TAG(inode), uid, gid);
-	inode->i_xid = INOXID_XID(XID_TAG(inode), uid, gid,
-		le16_to_cpu(raw_inode->i_raw_xid));
+	inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid);
+	inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid);
+	inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid,
+		le16_to_cpu(raw_inode->i_raw_tag));
 
 	inode->i_nlink = le16_to_cpu(raw_inode->i_links_count);
 	inode->i_size = le32_to_cpu(raw_inode->i_size);
@@ -1224,8 +1211,8 @@ static int ext2_update_inode(struct inode * inode, int do_sync)
 	struct ext2_inode_info *ei = EXT2_I(inode);
 	struct super_block *sb = inode->i_sb;
 	ino_t ino = inode->i_ino;
-	uid_t uid = XIDINO_UID(XID_TAG(inode), inode->i_uid, inode->i_xid);
-	gid_t gid = XIDINO_GID(XID_TAG(inode), inode->i_gid, inode->i_xid);
+	uid_t uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag);
+	gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag);
 	struct buffer_head * bh;
 	struct ext2_inode * raw_inode = ext2_get_inode(sb, ino, &bh);
 	int n;
@@ -1260,8 +1247,8 @@ static int ext2_update_inode(struct inode * inode, int do_sync)
 		raw_inode->i_uid_high = 0;
 		raw_inode->i_gid_high = 0;
 	}
-#ifdef CONFIG_INOXID_INTERN
-	raw_inode->i_raw_xid = cpu_to_le16(inode->i_xid);
+#ifdef CONFIG_TAGGING_INTERN
+	raw_inode->i_raw_tag = cpu_to_le16(inode->i_tag);
 #endif
 	raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
 	raw_inode->i_size = cpu_to_le32(inode->i_size);
@@ -1350,7 +1337,7 @@ int ext2_setattr(struct dentry *dentry, struct iattr *iattr)
 		return error;
 	if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) ||
 	    (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid) ||
-	    (iattr->ia_valid & ATTR_XID && iattr->ia_xid != inode->i_xid)) {
+	    (iattr->ia_valid & ATTR_TAG && iattr->ia_tag != inode->i_tag)) {
 		error = DQUOT_TRANSFER(inode, iattr) ? -EDQUOT : 0;
 		if (error)
 			return error;