diff -NurpP --minimal linux-2.6.19.1-vs2.2.0-rc6/fs/ext2/inode.c linux-2.6.19.1-vs2.2.0-rc6.1/fs/ext2/inode.c --- linux-2.6.19.1-vs2.2.0-rc6/fs/ext2/inode.c 2006-11-30 18:53:18 +0100 +++ linux-2.6.19.1-vs2.2.0-rc6.1/fs/ext2/inode.c 2006-12-24 01:53:10 +0100 @@ -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; } diff -NurpP --minimal linux-2.6.19.1-vs2.2.0-rc6/fs/ext3/inode.c linux-2.6.19.1-vs2.2.0-rc6.1/fs/ext3/inode.c --- linux-2.6.19.1-vs2.2.0-rc6/fs/ext3/inode.c 2006-11-30 19:02:16 +0100 +++ linux-2.6.19.1-vs2.2.0-rc6.1/fs/ext3/inode.c 2006-12-24 01:52:37 +0100 @@ -2595,13 +2595,9 @@ int ext3_sync_flags(struct inode *inode) int err = 0; oldflags = EXT3_I(inode)->i_flags; - newflags = oldflags & ~(EXT3_APPEND_FL | - EXT3_IMMUTABLE_FL | EXT3_IUNLINK_FL | - EXT3_BARRIER_FL | EXT3_NOATIME_FL | - EXT3_SYNC_FL | EXT3_DIRSYNC_FL); + newflags = oldflags & ~(EXT3_IMMUTABLE_FL | + EXT3_IUNLINK_FL | EXT3_BARRIER_FL); - if (IS_APPEND(inode)) - newflags |= EXT3_APPEND_FL; if (IS_IMMUTABLE(inode)) newflags |= EXT3_IMMUTABLE_FL; if (IS_IUNLINK(inode)) @@ -2609,14 +2605,6 @@ int ext3_sync_flags(struct inode *inode) if (IS_BARRIER(inode)) newflags |= EXT3_BARRIER_FL; - /* we do not want to copy superblock flags */ - if (inode->i_flags & S_NOATIME) - newflags |= EXT3_NOATIME_FL; - if (inode->i_flags & S_SYNC) - newflags |= EXT3_SYNC_FL; - if (inode->i_flags & S_DIRSYNC) - newflags |= EXT3_DIRSYNC_FL; - if (oldflags ^ newflags) { handle_t *handle; struct ext3_iloc iloc; diff -NurpP --minimal linux-2.6.19.1-vs2.2.0-rc6/fs/ext4/inode.c linux-2.6.19.1-vs2.2.0-rc6.1/fs/ext4/inode.c --- linux-2.6.19.1-vs2.2.0-rc6/fs/ext4/inode.c 2006-12-01 23:01:47 +0100 +++ linux-2.6.19.1-vs2.2.0-rc6.1/fs/ext4/inode.c 2006-12-24 01:54:14 +0100 @@ -2598,13 +2598,9 @@ int ext4_sync_flags(struct inode *inode) int err = 0; oldflags = EXT4_I(inode)->i_flags; - newflags = oldflags & ~(EXT4_APPEND_FL | - EXT4_IMMUTABLE_FL | EXT4_IUNLINK_FL | - EXT4_BARRIER_FL | EXT4_NOATIME_FL | - EXT4_SYNC_FL | EXT4_DIRSYNC_FL); + newflags = oldflags & ~(EXT4_IMMUTABLE_FL | + EXT4_IUNLINK_FL | EXT4_BARRIER_FL); - if (IS_APPEND(inode)) - newflags |= EXT4_APPEND_FL; if (IS_IMMUTABLE(inode)) newflags |= EXT4_IMMUTABLE_FL; if (IS_IUNLINK(inode)) @@ -2612,14 +2608,6 @@ int ext4_sync_flags(struct inode *inode) if (IS_BARRIER(inode)) newflags |= EXT4_BARRIER_FL; - /* we do not want to copy superblock flags */ - if (inode->i_flags & S_NOATIME) - newflags |= EXT4_NOATIME_FL; - if (inode->i_flags & S_SYNC) - newflags |= EXT4_SYNC_FL; - if (inode->i_flags & S_DIRSYNC) - newflags |= EXT4_DIRSYNC_FL; - if (oldflags ^ newflags) { handle_t *handle; struct ext4_iloc iloc; diff -NurpP --minimal linux-2.6.19.1-vs2.2.0-rc6/fs/jfs/jfs_inode.c linux-2.6.19.1-vs2.2.0-rc6.1/fs/jfs/jfs_inode.c --- linux-2.6.19.1-vs2.2.0-rc6/fs/jfs/jfs_inode.c 2006-11-08 04:57:51 +0100 +++ linux-2.6.19.1-vs2.2.0-rc6.1/fs/jfs/jfs_inode.c 2006-12-24 01:55:18 +0100 @@ -57,13 +57,9 @@ int jfs_sync_flags(struct inode *inode) unsigned int oldflags, newflags; oldflags = JFS_IP(inode)->mode2; - newflags = oldflags & ~(JFS_APPEND_FL | - JFS_IMMUTABLE_FL | JFS_IUNLINK_FL | - JFS_BARRIER_FL | JFS_NOATIME_FL | - JFS_SYNC_FL | JFS_DIRSYNC_FL); + newflags = oldflags & ~(JFS_IMMUTABLE_FL | + JFS_IUNLINK_FL | JFS_BARRIER_FL); - if (IS_APPEND(inode)) - newflags |= JFS_APPEND_FL; if (IS_IMMUTABLE(inode)) newflags |= JFS_IMMUTABLE_FL; if (IS_IUNLINK(inode)) @@ -71,14 +67,6 @@ int jfs_sync_flags(struct inode *inode) if (IS_BARRIER(inode)) newflags |= JFS_BARRIER_FL; - /* we do not want to copy superblock flags */ - if (inode->i_flags & S_NOATIME) - newflags |= JFS_NOATIME_FL; - if (inode->i_flags & S_SYNC) - newflags |= JFS_SYNC_FL; - if (inode->i_flags & S_DIRSYNC) - newflags |= JFS_DIRSYNC_FL; - if (oldflags ^ newflags) { JFS_IP(inode)->mode2 = newflags; inode->i_ctime = CURRENT_TIME; diff -NurpP --minimal linux-2.6.19.1-vs2.2.0-rc6/fs/ocfs2/inode.c linux-2.6.19.1-vs2.2.0-rc6.1/fs/ocfs2/inode.c --- linux-2.6.19.1-vs2.2.0-rc6/fs/ocfs2/inode.c 2006-12-02 01:35:31 +0100 +++ linux-2.6.19.1-vs2.2.0-rc6.1/fs/ocfs2/inode.c 2006-12-24 01:56:07 +0100 @@ -100,13 +100,9 @@ int ocfs2_sync_flags(struct inode *inode unsigned int oldflags, newflags; oldflags = OCFS2_I(inode)->ip_flags; - newflags = oldflags & ~(OCFS2_APPEND_FL | - OCFS2_IMMUTABLE_FL | OCFS2_IUNLINK_FL | - OCFS2_BARRIER_FL | OCFS2_NOATIME_FL | - OCFS2_SYNC_FL | OCFS2_DIRSYNC_FL); + newflags = oldflags & ~(OCFS2_IMMUTABLE_FL | + OCFS2_IUNLINK_FL | OCFS2_BARRIER_FL); - if (IS_APPEND(inode)) - newflags |= OCFS2_APPEND_FL; if (IS_IMMUTABLE(inode)) newflags |= OCFS2_IMMUTABLE_FL; if (IS_IUNLINK(inode)) @@ -114,14 +110,6 @@ int ocfs2_sync_flags(struct inode *inode if (IS_BARRIER(inode)) newflags |= OCFS2_BARRIER_FL; - /* we do not want to copy superblock flags */ - if (inode->i_flags & S_NOATIME) - newflags |= OCFS2_NOATIME_FL; - if (inode->i_flags & S_SYNC) - newflags |= OCFS2_SYNC_FL; - if (inode->i_flags & S_DIRSYNC) - newflags |= OCFS2_DIRSYNC_FL; - if (oldflags ^ newflags) return ocfs2_set_inode_attr(inode, newflags, OCFS2_FL_MASK);