瀏覽代碼

quota: Hide warnings about writes to the filesystem before quota was turned on

For a root filesystem write to the filesystem before quota is turned on happens
regularly and there's no way around it because of writes to syslog, /etc/mtab,
and similar. So the warning is rather pointless for ordinary users. It's
still useful during development so we just hide the warning behind
__DQUOT_PARANOIA config option.

Signed-off-by: Jan Kara <jack@suse.cz>
Jan Kara 15 年之前
父節點
當前提交
4c5e6c0e70
共有 1 個文件被更改,包括 6 次插入0 次删除
  1. 6 0
      fs/quota/dquot.c

+ 6 - 0
fs/quota/dquot.c

@@ -874,14 +874,18 @@ static int dqinit_needed(struct inode *inode, int type)
 static void add_dquot_ref(struct super_block *sb, int type)
 static void add_dquot_ref(struct super_block *sb, int type)
 {
 {
 	struct inode *inode, *old_inode = NULL;
 	struct inode *inode, *old_inode = NULL;
+#ifdef __DQUOT_PARANOIA
 	int reserved = 0;
 	int reserved = 0;
+#endif
 
 
 	spin_lock(&inode_lock);
 	spin_lock(&inode_lock);
 	list_for_each_entry(inode, &sb->s_inodes, i_sb_list) {
 	list_for_each_entry(inode, &sb->s_inodes, i_sb_list) {
 		if (inode->i_state & (I_FREEING|I_CLEAR|I_WILL_FREE|I_NEW))
 		if (inode->i_state & (I_FREEING|I_CLEAR|I_WILL_FREE|I_NEW))
 			continue;
 			continue;
+#ifdef __DQUOT_PARANOIA
 		if (unlikely(inode_get_rsv_space(inode) > 0))
 		if (unlikely(inode_get_rsv_space(inode) > 0))
 			reserved = 1;
 			reserved = 1;
+#endif
 		if (!atomic_read(&inode->i_writecount))
 		if (!atomic_read(&inode->i_writecount))
 			continue;
 			continue;
 		if (!dqinit_needed(inode, type))
 		if (!dqinit_needed(inode, type))
@@ -903,11 +907,13 @@ static void add_dquot_ref(struct super_block *sb, int type)
 	spin_unlock(&inode_lock);
 	spin_unlock(&inode_lock);
 	iput(old_inode);
 	iput(old_inode);
 
 
+#ifdef __DQUOT_PARANOIA
 	if (reserved) {
 	if (reserved) {
 		printk(KERN_WARNING "VFS (%s): Writes happened before quota"
 		printk(KERN_WARNING "VFS (%s): Writes happened before quota"
 			" was turned on thus quota information is probably "
 			" was turned on thus quota information is probably "
 			"inconsistent. Please run quotacheck(8).\n", sb->s_id);
 			"inconsistent. Please run quotacheck(8).\n", sb->s_id);
 	}
 	}
+#endif
 }
 }
 
 
 /*
 /*