Skip to contentSkip to conversation

fs/quota: erase unused but set variable warning

PATCH In review Jiang Biao 2 participants 2 messages Apr 24, 2019 – Apr 25, 2019 Diskquota

lore
Share & tools
lore

Jiang Biao

author
#0 lore raw

PATCH 1/1 fs/quota: erase unused but set variable warning

Local variable *reserved* of remove_dquot_ref() is only used if define CONFIG_QUOTA_DEBUG, but not ebraced in CONFIG_QUOTA_DEBUG macro, which leads to unused-but-set-variable warning when compiling.

This patch ebrace it into CONFIG_QUOTA_DEBUG macro like what is done in add_dquot_ref().

---
 fs/quota/dquot.c | 4 ++++
 1 file changed, 4 insertions(+)
fs/quota/dquot.c +4 -0
index fc20e06c56ba..14ee4c6deba1 100644
@@ -1049,7 +1049,9 @@ static void remove_dquot_ref(struct super_block *sb, int type,
 		struct list_head *tofree_head)
 {
 	struct inode *inode;
+#ifdef CONFIG_QUOTA_DEBUG
 	int reserved = 0;
+#endif
 
 	spin_lock(&sb->s_inode_list_lock);
 	list_for_each_entry(inode, &sb->s_inodes, i_sb_list) {
@@ -1061,8 +1063,10 @@ static void remove_dquot_ref(struct super_block *sb, int type,
 		 */
 		spin_lock(&dq_data_lock);
 		if (!IS_NOQUOTA(inode)) {
+#ifdef CONFIG_QUOTA_DEBUG
 			if (unlikely(inode_get_rsv_space(inode) > 0))
 				reserved = 1;
+#endif
 			remove_inode_dquot_ref(inode, type, tofree_head);
 		}
 		spin_unlock(&dq_data_lock);
Signature · 1 line
2.17.2 (Apple Git-113)
#1 lore raw
Quoted 8 lines · Jiang Biao

Local variable *reserved* of remove_dquot_ref() is only used if define CONFIG_QUOTA_DEBUG, but not ebraced in CONFIG_QUOTA_DEBUG macro, which leads to unused-but-set-variable warning when compiling.

This patch ebrace it into CONFIG_QUOTA_DEBUG macro like what is done in add_dquot_ref().

Thanks. I've added the patch to my tree.

Honza

Quoted 33 lines
---
 fs/quota/dquot.c | 4 ++++
 1 file changed, 4 insertions(+)
fs/quota/dquot.c +4 -0
index fc20e06c56ba..14ee4c6deba1 100644
@@ -1049,7 +1049,9 @@ static void remove_dquot_ref(struct super_block *sb, int type,
 		struct list_head *tofree_head)
 {
 	struct inode *inode;
+#ifdef CONFIG_QUOTA_DEBUG
 	int reserved = 0;
+#endif
 
 	spin_lock(&sb->s_inode_list_lock);
 	list_for_each_entry(inode, &sb->s_inodes, i_sb_list) {
@@ -1061,8 +1063,10 @@ static void remove_dquot_ref(struct super_block *sb, int type,
 		 */
 		spin_lock(&dq_data_lock);
 		if (!IS_NOQUOTA(inode)) {
+#ifdef CONFIG_QUOTA_DEBUG
 			if (unlikely(inode_get_rsv_space(inode) > 0))
 				reserved = 1;
+#endif
 			remove_inode_dquot_ref(inode, type, tofree_head);
 		}
 		spin_unlock(&dq_data_lock);
Signature · 1 line
2.17.2 (Apple Git-113)
Signature · 2 lines
Jan Kara <[email protected]>
SUSE Labs, CR