diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
| commit | 116674acc97ba75a720329996877077d988443a2 (patch) | |
| tree | 6a3f2ff0b612ae2ee8a3f3509370c9e6333a53b3 /fs/dquot.c | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'fs/dquot.c')
| -rw-r--r-- | fs/dquot.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/dquot.c b/fs/dquot.c index a63685d34..769b08ba2 100644 --- a/fs/dquot.c +++ b/fs/dquot.c @@ -47,12 +47,11 @@ #include <linux/stat.h> #include <linux/tty.h> #include <linux/file.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/mount.h> #include <linux/smp.h> #include <linux/smp_lock.h> #include <linux/init.h> -#include <linux/slab.h> #include <asm/uaccess.h> @@ -1536,7 +1535,7 @@ asmlinkage long sys_quotactl(int cmd, const char *special, int id, caddr_t addr) break; case Q_GETQUOTA: if (((type == USRQUOTA && current->euid != id) || - (type == GRPQUOTA && in_egroup_p(id))) && + (type == GRPQUOTA && !in_egroup_p(id))) && !capable(CAP_SYS_RESOURCE)) goto out; break; |