patch-2.3.99-pre4 linux/fs/dquot.c

• Lines: 52
• Date: Mon Apr 3 14:56:26 2000
• Orig file: v2.3.99-pre3/linux/fs/dquot.c
• Orig date: Sun Mar 19 18:35:31 2000

diff -u --recursive --new-file v2.3.99-pre3/linux/fs/dquot.c linux/fs/dquot.c
@@ -716,15 +716,16 @@
 	}
 	inode->i_flags &= ~S_QUOTA;
 put_it:
-	if (dquot != NODQUOT)
+	if (dquot != NODQUOT) {
 		if (dqput_blocks(dquot)) {
 			if (dquot->dq_count != 1)
 				printk(KERN_WARNING "VFS: Adding dquot with dq_count %d to dispose list.\n", dquot->dq_count);
 			list_add(&dquot->dq_free, tofree_head);	/* As dquot must have currently users it can't be on the free list... */
 			return 1;
-		}
-		else
+		} else {
 			dqput(dquot);   /* We have guaranteed we won't block */
+		}
+	}
 	return 0;
 }
 
@@ -793,20 +794,12 @@
 
 static void print_warning(struct dquot *dquot, int flag, const char *fmtstr)
 {
-	struct dentry *root;
-	char *path, *buffer;
-
 	if (!need_print_warning(dquot, flag))
 		return;
-	root = dquot->dq_sb->s_root;
-	dget(root);
-	buffer = (char *) __get_free_page(GFP_KERNEL);
-	path = buffer ? d_path(root, buffer, PAGE_SIZE) : "?";
-	sprintf(quotamessage, fmtstr, path, quotatypes[dquot->dq_type]);
-	free_page((unsigned long) buffer);
+	sprintf(quotamessage, fmtstr,
+		bdevname(dquot->dq_sb->s_dev), quotatypes[dquot->dq_type]);
 	tty_write_message(current->tty, quotamessage);
 	dquot->dq_flags |= flag;
-	dput(root);
 }
 
 static inline char ignore_hardlimit(struct dquot *dquot)
@@ -1469,7 +1462,7 @@
 	if (IS_ERR(tmp))
 		goto out_lock;
 
-	f = filp_open(tmp, O_RDWR, 0600, NULL);
+	f = filp_open(tmp, O_RDWR, 0600);
 	putname(tmp);
 
 	error = PTR_ERR(f);