Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02a55ca8 authored by Jan Kara's avatar Jan Kara Committed by Linus Torvalds
Browse files

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: default avatarJan Kara <jack@suse.cz>
Cc: "Vegard Nossum" <vegard.nossum@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b85f4b87

fs/quota.c

+12 −6
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ static void quota_sync_sb(struct super_block *sb, int type) 


void sync_dquots(struct super_block *sb, int type)

{

	int cnt, dirty;

	int cnt;



	if (sb) {

		if (sb->s_qcop->quota_sync)
@@ -198,11 +198,17 @@ void sync_dquots(struct super_block *sb, int type) 
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]))

				dirty = 1;

		if (!dirty)

		for (cnt = 0; cnt < MAXQUOTAS; cnt++) {

			if (type != -1 && type != cnt)

				continue;

			if (!sb_has_quota_enabled(sb, cnt))

				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;

		sb->s_count++;

		spin_unlock(&sb_lock);

include/linux/quota.h

+0 −2
Original line number Diff line number Diff line
@@ -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))