From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Tue, 30 Nov 2004 16:43:03 +0000 (+0000)
Subject: - merge revision 1.7
X-Git-Tag: after-CAN_2004_1016_1017_1068-merge~17
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3fc03fb0d6c9c9d32852c6a86709cae035c8931b;p=linux-2.6.git

- merge revision 1.7
date: 2004/11/23 15:04:35;  author: mlhuang;  state: Exp;  lines: +1 -1
- make sure that all extended attributes are passed properly to the
  inode structure
---

diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 1ef02bccb..fe9c6a13b 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -1030,7 +1030,7 @@ void ext2_set_inode_flags(struct inode *inode)
 {
 	unsigned int flags = EXT2_I(inode)->i_flags;
 
-	inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);
+	inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_IUNLINK|S_BARRIER|S_NOATIME|S_DIRSYNC);
 	if (flags & EXT2_SYNC_FL)
 		inode->i_flags |= S_SYNC;
 	if (flags & EXT2_APPEND_FL)