3 files changed, 22 insertions, 0 deletions

diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index f9bcddbd2ef1..e1bb03171986 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -2580,6 +2580,25 @@ void ext3_set_inode_flags(struct inode *inode)
                 inode->i_flags |= S_DIRSYNC;
 }
 
+/* Propagate flags from i_flags to EXT3_I(inode)->i_flags */
+void ext3_get_inode_flags(struct ext3_inode_info *ei)
+{
+        unsigned int flags = ei->vfs_inode.i_flags;
+
+        ei->i_flags &= ~(EXT3_SYNC_FL|EXT3_APPEND_FL|
+                        EXT3_IMMUTABLE_FL|EXT3_NOATIME_FL|EXT3_DIRSYNC_FL);
+        if (flags & S_SYNC)
+                ei->i_flags |= EXT3_SYNC_FL;
+        if (flags & S_APPEND)
+                ei->i_flags |= EXT3_APPEND_FL;
+        if (flags & S_IMMUTABLE)
+                ei->i_flags |= EXT3_IMMUTABLE_FL;
+        if (flags & S_NOATIME)
+                ei->i_flags |= EXT3_NOATIME_FL;
+        if (flags & S_DIRSYNC)
+                ei->i_flags |= EXT3_DIRSYNC_FL;
+}
+
 void ext3_read_inode(struct inode * inode)
 {
         struct ext3_iloc iloc;
@@ -2735,6 +2754,7 @@ static int ext3_do_update_inode(handle_t *handle,
         if (ei->i_state & EXT3_STATE_NEW)
                 memset(raw_inode, 0, EXT3_SB(inode->i_sb)->s_inode_size);
 
+        ext3_get_inode_flags(ei);
         raw_inode->i_mode = cpu_to_le16(inode->i_mode);
         if(!(test_opt(inode->i_sb, NO_UID32))) {
                 raw_inode->i_uid_low = cpu_to_le16(low_16_bits(inode->i_uid));
diff --git a/fs/ext3/ioctl.c b/fs/ext3/ioctl.c
index 9b8090d94e6c..965006dba6be 100644
--- a/fs/ext3/ioctl.c
+++ b/fs/ext3/ioctl.c
@@ -28,6 +28,7 @@ int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
 
         switch (cmd) {
         case EXT3_IOC_GETFLAGS:
+                ext3_get_inode_flags(ei);
                 flags = ei->i_flags & EXT3_FL_USER_VISIBLE;
                 return put_user(flags, (int __user *) arg);
         case EXT3_IOC_SETFLAGS: {
diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h
index 4eb18ac510ae..ece49a804fe1 100644
--- a/include/linux/ext3_fs.h
+++ b/include/linux/ext3_fs.h
@@ -824,6 +824,7 @@ extern int ext3_change_inode_journal_flag(struct inode *, int);
 extern int ext3_get_inode_loc(struct inode *, struct ext3_iloc *);
 extern void ext3_truncate (struct inode *);
 extern void ext3_set_inode_flags(struct inode *);
+extern void ext3_get_inode_flags(struct ext3_inode_info *);
 extern void ext3_set_aops(struct inode *inode);
 
 /* ioctl.c */