[PATCH] quota: Remove use of info_any_dirty()

[Jan Kara]

Since there is only a single place which uses info_any_dirty() and that
is a trivial macro, just remove the use of this macro completely.

Signed-off-by: Jan Kara <jack@xxxxxxx>
---
 fs/quota.c            |    7 +++++--
 include/linux/quota.h |    2 --
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/fs/quota.c b/fs/quota.c
index db1cc9f..f0702f4 100644
--- a/fs/quota.c
+++ b/fs/quota.c
@@ -199,8 +199,11 @@ restart:
 	list_for_each_entry(sb, &super_blocks, s_list) {
 		/* This test just improves performance so it needn't be reliable... */
 		for (cnt = 0, dirty = 0; cnt < MAXQUOTAS; cnt++)
-			if ((type == cnt || type == -1) && sb_has_quota_enabled(sb, cnt)
-			    && info_any_dirty(&sb_dqopt(sb)->info[cnt]))
+			if ((type == cnt || type == -1)
+			    && sb_has_quota_enabled(sb, cnt)
+			    && (info_dirty(&sb_dqopt(sb)->info[cnt])
+				|| !list_empty(&sb_dqopt(sb)->
+					info[cnt].dqi_dirty_list)))
 				dirty = 1;
 		if (!dirty)
 			continue;
diff --git a/include/linux/quota.h b/include/linux/quota.h
index dcddfb2..6f1d97d 100644
--- a/include/linux/quota.h
+++ b/include/linux/quota.h
@@ -224,8 +224,6 @@ struct super_block;
 
 extern void mark_info_dirty(struct super_block *sb, int type);
 #define info_dirty(info) test_bit(DQF_INFO_DIRTY_B, &(info)->dqi_flags)
-#define info_any_dquot_dirty(info) (!list_empty(&(info)->dqi_dirty_list))
-#define info_any_dirty(info) (info_dirty(info) || info_any_dquot_dirty(info))
 
 #define sb_dqopt(sb) (&(sb)->s_dquot)
 #define sb_dqinfo(sb, type) (sb_dqopt(sb)->info+(type))
-- 
1.5.2.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/