Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Jan Kara and committed by
Linus Torvalds
02a55ca8 b85f4b87

+12 -8
+12 -6
fs/quota.c
··· 186 186 187 187 void sync_dquots(struct super_block *sb, int type) 188 188 { 189 - int cnt, dirty; 189 + int cnt; 190 190 191 191 if (sb) { 192 192 if (sb->s_qcop->quota_sync) ··· 198 198 restart: 199 199 list_for_each_entry(sb, &super_blocks, s_list) { 200 200 /* This test just improves performance so it needn't be reliable... */ 201 - for (cnt = 0, dirty = 0; cnt < MAXQUOTAS; cnt++) 202 - if ((type == cnt || type == -1) && sb_has_quota_enabled(sb, cnt) 203 - && info_any_dirty(&sb_dqopt(sb)->info[cnt])) 204 - dirty = 1; 205 - if (!dirty) 201 + for (cnt = 0; cnt < MAXQUOTAS; cnt++) { 202 + if (type != -1 && type != cnt) 203 + continue; 204 + if (!sb_has_quota_enabled(sb, cnt)) 205 + continue; 206 + if (!info_dirty(&sb_dqopt(sb)->info[cnt]) && 207 + list_empty(&sb_dqopt(sb)->info[cnt].dqi_dirty_list)) 208 + continue; 209 + break; 210 + } 211 + if (cnt == MAXQUOTAS) 206 212 continue; 207 213 sb->s_count++; 208 214 spin_unlock(&sb_lock);
-2
include/linux/quota.h
··· 224 224 225 225 extern void mark_info_dirty(struct super_block *sb, int type); 226 226 #define info_dirty(info) test_bit(DQF_INFO_DIRTY_B, &(info)->dqi_flags) 227 - #define info_any_dquot_dirty(info) (!list_empty(&(info)->dqi_dirty_list)) 228 - #define info_any_dirty(info) (info_dirty(info) || info_any_dquot_dirty(info)) 229 227 230 228 #define sb_dqopt(sb) (&(sb)->s_dquot) 231 229 #define sb_dqinfo(sb, type) (sb_dqopt(sb)->info+(type))