Merge branch 'docs-next' of git://git.lwn.net/linux-2.6

[karo-tx-linux.git] / fs / ext2 / ioctl.c

diff --git a/fs/ext2/ioctl.c b/fs/ext2/ioctl.c
index de876fa793e1d140386f8bd9693785943f706c09..7cb4badef927433ec90618b67c69cc08bec936f1 100644 (file)
--- a/fs/ext2/ioctl.c
+++ b/fs/ext2/ioctl.c
@@ -50,8 +50,7 @@ long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                        goto setflags_out;
                }
 
-               if (!S_ISDIR(inode->i_mode))
-                       flags &= ~EXT2_DIRSYNC_FL;
+               flags = ext2_mask_flags(inode->i_mode, flags);
 
                mutex_lock(&inode->i_mutex);
                /* Is it quota file? Do not allow user to mess with it */