Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 02a55ca87185e114e5d298a8d00608501dbabf67

Authored by Jan Kara
Committed by Linus Torvalds
1 parent b85f4b87a5
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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>

Showing 2 changed files with 12 additions and 8 deletions Side-by-side Diff

... ... @@ -186,7 +186,7 @@
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,11 +198,17 @@
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);
include/linux/quota.h
Diff comments   View file @ 02a55ca
... ... @@ -224,8 +224,6 @@
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))