Commit 5fb324ad authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jan Kara
Browse files

quota: move code from sync_quota_sb into vfs_quota_sync 



Currenly sync_quota_sb does a lot of sync and truncate action that only
applies to "VFS" style quotas and is actively harmful for the sync
performance in XFS.  Move it into vfs_quota_sync and add a wait parameter
to ->quota_sync to tell if we need it or not.

My audit of the GFS2 code says it's also not needed given the way GFS2
implements quotas, but I'd be happy if this can get a detailed review.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 8c4e4acd

fs/gfs2/quota.c

+7 −2
Original line number Diff line number Diff line
@@ -1083,7 +1083,7 @@ void gfs2_quota_change(struct gfs2_inode *ip, s64 change, 
	}

}



int gfs2_quota_sync(struct super_block *sb, int type)

int gfs2_quota_sync(struct super_block *sb, int type, int wait)

{

	struct gfs2_sbd *sdp = sb->s_fs_info;

	struct gfs2_quota_data **qda;
@@ -1127,6 +1127,11 @@ int gfs2_quota_sync(struct super_block *sb, int type) 
	return error;

}



static int gfs2_quota_sync_timeo(struct super_block *sb, int type)

{

	return gfs2_quota_sync(sb, type, 0);

}



int gfs2_quota_refresh(struct gfs2_sbd *sdp, int user, u32 id)

{

	struct gfs2_quota_data *qd;
@@ -1382,7 +1387,7 @@ int gfs2_quotad(void *data) 
					   &tune->gt_statfs_quantum);



		/* Update quota file */

		quotad_check_timeo(sdp, "sync", gfs2_quota_sync, t,

		quotad_check_timeo(sdp, "sync", gfs2_quota_sync_timeo, t,

				   &quotad_timeo, &tune->gt_quota_quantum);



		/* Check for & recover partially truncated inodes */

fs/gfs2/quota.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ extern int gfs2_quota_check(struct gfs2_inode *ip, u32 uid, u32 gid); 
extern void gfs2_quota_change(struct gfs2_inode *ip, s64 change,

			      u32 uid, u32 gid);



extern int gfs2_quota_sync(struct super_block *sb, int type);

extern int gfs2_quota_sync(struct super_block *sb, int type, int wait);

extern int gfs2_quota_refresh(struct gfs2_sbd *sdp, int user, u32 id);



extern int gfs2_quota_init(struct gfs2_sbd *sdp);

fs/gfs2/super.c

+1 −1
Original line number Diff line number Diff line
@@ -764,7 +764,7 @@ static int gfs2_make_fs_ro(struct gfs2_sbd *sdp) 
	int error;



	flush_workqueue(gfs2_delete_workqueue);

	gfs2_quota_sync(sdp->sd_vfs, 0);

	gfs2_quota_sync(sdp->sd_vfs, 0, 1);

	gfs2_statfs_sync(sdp->sd_vfs, 0);



	error = gfs2_glock_nq_init(sdp->sd_trans_gl, LM_ST_SHARED, GL_NOCACHE,

fs/gfs2/sys.c

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static ssize_t quota_sync_store(struct gfs2_sbd *sdp, const char *buf, 
	if (simple_strtol(buf, NULL, 0) != 1)

		return -EINVAL;



	gfs2_quota_sync(sdp->sd_vfs, 0);

	gfs2_quota_sync(sdp->sd_vfs, 0, 1);

	return len;

}

fs/quota/dquot.c

+28 −1
Original line number Diff line number Diff line
@@ -570,7 +570,7 @@ out: 
}

EXPORT_SYMBOL(dquot_scan_active);



int vfs_quota_sync(struct super_block *sb, int type)

int vfs_quota_sync(struct super_block *sb, int type, int wait)

{

	struct list_head *dirty;

	struct dquot *dquot;
@@ -615,6 +615,33 @@ int vfs_quota_sync(struct super_block *sb, int type) 
	spin_unlock(&dq_list_lock);

	mutex_unlock(&dqopt->dqonoff_mutex);



	if (!wait || (sb_dqopt(sb)->flags & DQUOT_QUOTA_SYS_FILE))

		return 0;



	/* This is not very clever (and fast) but currently I don't know about

	 * any other simple way of getting quota data to disk and we must get

	 * them there for userspace to be visible... */

	if (sb->s_op->sync_fs)

		sb->s_op->sync_fs(sb, 1);

	sync_blockdev(sb->s_bdev);



	/*

	 * Now when everything is written we can discard the pagecache so

	 * that userspace sees the changes.

	 */

	mutex_lock(&sb_dqopt(sb)->dqonoff_mutex);

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

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

			continue;

		if (!sb_has_quota_active(sb, cnt))

			continue;

		mutex_lock_nested(&sb_dqopt(sb)->files[cnt]->i_mutex,

				  I_MUTEX_QUOTA);

		truncate_inode_pages(&sb_dqopt(sb)->files[cnt]->i_data, 0);

		mutex_unlock(&sb_dqopt(sb)->files[cnt]->i_mutex);

	}

	mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex);



	return 0;

}

EXPORT_SYMBOL(vfs_quota_sync);

CRA Git | Maintained and supported by SUSTech CRA and CCSE