summaryrefslogtreecommitdiff
path: root/fs/ext4/ioctl.c
diff options
context:
space:
mode:
authorDuane Griffin <duaneg@dghda.com>2009-02-15 18:09:20 -0500
committerTheodore Ts'o <tytso@mit.edu>2009-02-15 18:09:20 -0500
commit2dc6b0d48ca0599837df21b14bb8393d0804af57 (patch)
treeb70dd83908f9bcb3cb953e5b7df1837268968c2e /fs/ext4/ioctl.c
parent8fa43a81b97853fc69417bb6054182e78f95cbeb (diff)
downloadlinux-3.10-2dc6b0d48ca0599837df21b14bb8393d0804af57.tar.gz
linux-3.10-2dc6b0d48ca0599837df21b14bb8393d0804af57.tar.bz2
linux-3.10-2dc6b0d48ca0599837df21b14bb8393d0804af57.zip
ext4: tighten restrictions on inode flags
At the moment there are few restrictions on which flags may be set on which inodes. Specifically DIRSYNC may only be set on directories and IMMUTABLE and APPEND may not be set on links. Tighten that to disallow TOPDIR being set on non-directories and only NODUMP and NOATIME to be set on non-regular file, non-directories. Introduces a flags masking function which masks flags based on mode and use it during inode creation and when flags are set via the ioctl to facilitate future consistency. Signed-off-by: Duane Griffin <duaneg@dghda.com> Acked-by: Andreas Dilger <adilger@sun.com> Cc: <linux-ext4@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/ioctl.c')
-rw-r--r--fs/ext4/ioctl.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 42dc83fb247..22dd29f3ebc 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -48,8 +48,7 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
if (err)
return err;
- if (!S_ISDIR(inode->i_mode))
- flags &= ~EXT4_DIRSYNC_FL;
+ flags = ext4_mask_flags(inode->i_mode, flags);
err = -EPERM;
mutex_lock(&inode->i_mutex);