patch-2.4.0-test12 linux/fs/dquot.c

• Lines: 18
• Date: Tue Nov 28 22:40:50 2000
• Orig file: v2.4.0-test11/linux/fs/dquot.c
• Orig date: Sun Nov 19 18:44:18 2000

diff -u --recursive --new-file v2.4.0-test11/linux/fs/dquot.c linux/fs/dquot.c
@@ -522,7 +522,7 @@
 struct dquot *get_empty_dquot(void)
 {
 	struct dquot *dquot;
-	int shrink = 1;	/* Number of times we should try to shrink dcache and icache */
+	int shrink = 8;	/* Number of times we should try to shrink dcache and icache */
 
 repeat:
 	dquot = find_best_free();
@@ -1474,7 +1474,7 @@
 	if (IS_ERR(f))
 		goto out_lock;
 	error = -EIO;
-	if (!f->f_op->read && !f->f_op->write)
+	if (!f->f_op || (!f->f_op->read && !f->f_op->write))
 		goto out_f;
 	inode = f->f_dentry->d_inode;
 	error = -EACCES;