summaryrefslogtreecommitdiffstats
path: root/fs/dquot.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-03-17 22:05:47 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-03-17 22:05:47 +0000
commit27cfca1ec98e91261b1a5355d10a8996464b63af (patch)
tree8e895a53e372fa682b4c0a585b9377d67ed70d0e /fs/dquot.c
parent6a76fb7214c477ccf6582bd79c5b4ccc4f9c41b1 (diff)
Look Ma' what I found on my harddisk ...
o New faster syscalls for 2.1.x, too o Upgrade to 2.1.89. Don't try to run this. It's flaky as hell. But feel free to debug ...
Diffstat (limited to 'fs/dquot.c')
-rw-r--r--fs/dquot.c32
1 files changed, 22 insertions, 10 deletions
diff --git a/fs/dquot.c b/fs/dquot.c
index 4e2c60162..b868ac3d7 100644
--- a/fs/dquot.c
+++ b/fs/dquot.c
@@ -17,12 +17,18 @@
*
* Author: Marco van Wieringen <mvw@mcs.ow.nl> <mvw@tnix.net>
*
- * Fixes: Dmitry Gorodchanin <begemot@bgm.rosprint.net>, 11 Feb 96
+ * Fixes: Dmitry Gorodchanin <pgmdsg@ibi.com>, 11 Feb 96
* removed race conditions in dqput(), dqget() and iput().
* Andi Kleen removed all verify_area() calls, 31 Dec 96
* Nick Kralevich <nickkral@cal.alumni.berkeley.edu>, 21 Jul 97
* Fixed a condition where user and group quotas could get mixed up.
*
+ * Chris Rankin <rankinc@bellsouth.net>, 31 Dec 97, 2-4 Jan 98
+ * Fixed kernel API so that the user can get the quota for any
+ * group s/he belongs to. Also return useful error codes when
+ * turning quotas off, and fixed sync_dquot() so that all devices
+ * are synced when dev==NODEV.
+ *
* (C) Copyright 1994, 1995 Marco van Wieringen
*
*/
@@ -273,7 +279,7 @@ int sync_dquots(kdev_t dev, short type)
dqstats.syncs++;
for (i = 0; i < nr_dquots * 2; i++, dquot = dquot->dq_next) {
- if (dev == NODEV || dquot->dq_count == 0 || dquot->dq_dev != dev)
+ if ((dev != NODEV && dquot->dq_dev != dev) || dquot->dq_count == 0 )
continue;
if (type != -1 && dquot->dq_type != type)
continue;
@@ -592,13 +598,13 @@ static int set_dqblk(kdev_t dev, int id, short type, int flags, struct dqblk *dq
}
if ((dquot = dqget(dev, id, type)) != NODQUOT) {
lock_dquot(dquot);
- if (id > 0 && ((flags & SET_QUOTA) || (flags & SET_QLIMIT))) {
+ if (id > 0 && (flags & (SET_QUOTA|SET_QLIMIT))) {
dquot->dq_bhardlimit = dq_dqblk.dqb_bhardlimit;
dquot->dq_bsoftlimit = dq_dqblk.dqb_bsoftlimit;
dquot->dq_ihardlimit = dq_dqblk.dqb_ihardlimit;
dquot->dq_isoftlimit = dq_dqblk.dqb_isoftlimit;
}
- if ((flags & SET_QUOTA) || (flags & SET_USE)) {
+ if (flags & (SET_QUOTA|SET_USE)) {
if (dquot->dq_isoftlimit &&
dquot->dq_curinodes < dquot->dq_isoftlimit &&
dq_dqblk.dqb_curinodes >= dquot->dq_isoftlimit)
@@ -917,16 +923,22 @@ int quota_off(kdev_t dev, short type)
struct vfsmount *vfsmnt;
short cnt;
+ if ( !(vfsmnt = lookup_vfsmnt(dev)) )
+ return -ENODEV;
+
for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
if (type != -1 && cnt != type)
continue;
- if ((vfsmnt = lookup_vfsmnt(dev)) == (struct vfsmount *)NULL ||
- vfsmnt->mnt_quotas[cnt] == (struct file *)NULL)
- continue;
+ if (vfsmnt->mnt_quotas[cnt] == (struct file *)NULL)
+ {
+ if(type == -1)
+ continue;
+ return -ESRCH;
+ }
vfsmnt->mnt_sb->dq_op = (struct dquot_operations *)NULL;
reset_dquot_ptrs(dev, cnt);
invalidate_dquots(dev, cnt);
- close_fp(vfsmnt->mnt_quotas[cnt]);
+ fput(vfsmnt->mnt_quotas[cnt]);
vfsmnt->mnt_quotas[cnt] = (struct file *)NULL;
vfsmnt->mnt_iexp[cnt] = vfsmnt->mnt_bexp[cnt] = (time_t)NULL;
}
@@ -1027,7 +1039,7 @@ asmlinkage int sys_quotactl(int cmd, const char *special, int id, caddr_t addr)
break;
case Q_GETQUOTA:
if (((type == USRQUOTA && current->uid != id) ||
- (type == GRPQUOTA && current->gid != id)) && !fsuser())
+ (type == GRPQUOTA && in_group_p(id))) && !fsuser())
goto out;
break;
default:
@@ -1036,7 +1048,7 @@ asmlinkage int sys_quotactl(int cmd, const char *special, int id, caddr_t addr)
}
ret = -EINVAL;
- dev = 0;
+ dev = NODEV;
if (special != NULL || (cmds != Q_SYNC && cmds != Q_GETSTATS)) {
mode_t mode;
struct dentry * dentry;