quota: cleanup loop in sync_dquots()

Make loop in sync_dquots() checking whether there's something to write
more readable, remove useless variable and macro info_any_dirty() which
is used only in this place.

Signed-off-by: Jan Kara <jack@suse.cz>
Cc: "Vegard Nossum" <vegard.nossum@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jan Kara 2008-07-25 01:46:50 -07:00 committed by Linus Torvalds
parent b85f4b87a5
commit 02a55ca871
2 changed files with 12 additions and 8 deletions

View file

@ -186,7 +186,7 @@ static void quota_sync_sb(struct super_block *sb, int type)
void sync_dquots(struct super_block *sb, int type) void sync_dquots(struct super_block *sb, int type)
{ {
int cnt, dirty; int cnt;
if (sb) { if (sb) {
if (sb->s_qcop->quota_sync) if (sb->s_qcop->quota_sync)
@ -198,11 +198,17 @@ void sync_dquots(struct super_block *sb, int type)
restart: restart:
list_for_each_entry(sb, &super_blocks, s_list) { list_for_each_entry(sb, &super_blocks, s_list) {
/* This test just improves performance so it needn't be reliable... */ /* This test just improves performance so it needn't be reliable... */
for (cnt = 0, dirty = 0; cnt < MAXQUOTAS; cnt++) for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
if ((type == cnt || type == -1) && sb_has_quota_enabled(sb, cnt) if (type != -1 && type != cnt)
&& info_any_dirty(&sb_dqopt(sb)->info[cnt])) continue;
dirty = 1; if (!sb_has_quota_enabled(sb, cnt))
if (!dirty) continue;
if (!info_dirty(&sb_dqopt(sb)->info[cnt]) &&
list_empty(&sb_dqopt(sb)->info[cnt].dqi_dirty_list))
continue;
break;
}
if (cnt == MAXQUOTAS)
continue; continue;
sb->s_count++; sb->s_count++;
spin_unlock(&sb_lock); spin_unlock(&sb_lock);

View file

@ -224,8 +224,6 @@ struct super_block;
extern void mark_info_dirty(struct super_block *sb, int type); 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_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_dqopt(sb) (&(sb)->s_dquot)
#define sb_dqinfo(sb, type) (sb_dqopt(sb)->info+(type)) #define sb_dqinfo(sb, type) (sb_dqopt(sb)->info+(type))