aboutsummaryrefslogtreecommitdiff
path: root/fs/ext4
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2007-11-25 09:53:27 +0000
committerSteve French <sfrench@us.ibm.com>2007-11-25 09:53:27 +0000
commit058250a0d5886b4d96a195ecc7e3a75e2df5e4b1 (patch)
treefb67e8f5258c6aa11d4e8c39650e23de7556b38d /fs/ext4
parentcea218054ad277d6c126890213afde07b4eb1602 (diff)
parent2ffbb8377c7a0713baf6644e285adc27a5654582 (diff)
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/ioctl.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index c04c7ccba9e..e7f894bdb42 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -51,6 +51,11 @@ int ext4_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
flags &= ~EXT4_DIRSYNC_FL;
mutex_lock(&inode->i_mutex);
+ /* Is it quota file? Do not allow user to mess with it */
+ if (IS_NOQUOTA(inode)) {
+ mutex_unlock(&inode->i_mutex);
+ return -EPERM;
+ }
oldflags = ei->i_flags;
/* The JOURNAL_DATA flag is modifiable only by root */