patch-2.2.15 linux/fs/dquot.c

• Lines: 29
• Date: Fri Apr 21 12:46:41 2000
• Orig file: v2.2.14/fs/dquot.c
• Orig date: Tue Jan 4 21:19:00 2000

diff -u --new-file --recursive --exclude-from ../../exclude v2.2.14/fs/dquot.c linux/fs/dquot.c
@@ -539,7 +539,6 @@
 struct dquot *get_empty_dquot(void)
 {
 	struct dquot *dquot;
-	int count;
 
 repeat:
 	dquot = find_best_free();
@@ -569,10 +568,9 @@
 	/*
 	 * Try pruning the dcache to free up some dquots ...
 	 */
-	printk(KERN_DEBUG "get_empty_dquot: pruning %d\n", count);
 	if (prune_dcache(0, 128))
 	{
-		free_inode_memory(count);
+		free_inode_memory(10);
 		goto repeat;
 	}
 
@@ -1584,7 +1582,7 @@
 			break;
 		case Q_GETQUOTA:
 			if (((type == USRQUOTA && current->euid != id) ||
-			     (type == GRPQUOTA && in_group_p(id))) &&
+			     (type == GRPQUOTA && !in_egroup_p(id))) &&
 			    !capable(CAP_SYS_RESOURCE))
 				goto out;
 			break;