Commit 5a1906a4 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

gfs2: Revert "check for no eligible quota changes"



Since the previous commit, function gfs2_quota_sync() will not cause the
sync generation to creep forward by one every time the function is
called; this helps keep things a but more tidy.  We also don't care that
this function allocates a page of memory every time it is called, so no
good reason for keeping qd_changed() anymore, which just duplicates
qd_grab_sync().

This reverts commit 06aa6fd3.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent d9a75a60
Loading
Loading
Loading
Loading
+0 −20
Original line number Diff line number Diff line
@@ -1308,24 +1308,6 @@ void gfs2_quota_change(struct gfs2_inode *ip, s64 change,
	}
}

static bool qd_changed(struct gfs2_sbd *sdp)
{
	struct gfs2_quota_data *qd;
	bool changed = false;

	spin_lock(&qd_lock);
	list_for_each_entry(qd, &sdp->sd_quota_list, qd_list) {
		spin_lock(&qd->qd_lockref.lock);
		changed = !test_bit(QDF_LOCKED, &qd->qd_flags) &&
			  test_bit(QDF_CHANGE, &qd->qd_flags);
		spin_unlock(&qd->qd_lockref.lock);
		if (changed)
			break;
	}
	spin_unlock(&qd_lock);
	return changed;
}

int gfs2_quota_sync(struct super_block *sb, int type)
{
	struct gfs2_sbd *sdp = sb->s_fs_info;
@@ -1336,8 +1318,6 @@ int gfs2_quota_sync(struct super_block *sb, int type)

	if (sb_rdonly(sdp->sd_vfs))
		return 0;
	if (!qd_changed(sdp))
		return 0;

	qda = kcalloc(max_qd, sizeof(struct gfs2_quota_data *), GFP_KERNEL);
	if (!qda)