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

Commit 8c42d637 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

GFS2: Alter arguments of gfs2_quota/statfs_sync 



These two functions are altered so that gfs2_quota_sync may
in future be called directly from the VFS. The GFS2 superblock
changes to a VFS super block and there is an addition of an int
argument which is currently ignored.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent ab201832

fs/gfs2/quota.c

+4 −3
Original line number Diff line number Diff line
@@ -1069,8 +1069,9 @@ void gfs2_quota_change(struct gfs2_inode *ip, s64 change, 
	}

}



int gfs2_quota_sync(struct gfs2_sbd *sdp)

int gfs2_quota_sync(struct super_block *sb, int type)

{

	struct gfs2_sbd *sdp = sb->s_fs_info;

	struct gfs2_quota_data **qda;

	unsigned int max_qd = gfs2_tune_get(sdp, gt_quota_simul_sync);

	unsigned int num_qd;
@@ -1298,12 +1299,12 @@ static void quotad_error(struct gfs2_sbd *sdp, const char *msg, int error) 
}



static void quotad_check_timeo(struct gfs2_sbd *sdp, const char *msg,

			       int (*fxn)(struct gfs2_sbd *sdp),

			       int (*fxn)(struct super_block *sb, int type),

			       unsigned long t, unsigned long *timeo,

			       unsigned int *new_timeo)

{

	if (t >= *timeo) {

		int error = fxn(sdp);

		int error = fxn(sdp->sd_vfs, 0);

		quotad_error(sdp, msg, error);

		*timeo = gfs2_tune_get_i(&sdp->sd_tune, new_timeo) * HZ;

	} else {

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 gfs2_sbd *sdp);

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

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

+4 −3
Original line number Diff line number Diff line
@@ -484,8 +484,9 @@ void update_statfs(struct gfs2_sbd *sdp, struct buffer_head *m_bh, 
	gfs2_statfs_change_out(m_sc, m_bh->b_data + sizeof(struct gfs2_dinode));

}



int gfs2_statfs_sync(struct gfs2_sbd *sdp)

int gfs2_statfs_sync(struct super_block *sb, int type)

{

	struct gfs2_sbd *sdp = sb->s_fs_info;

	struct gfs2_inode *m_ip = GFS2_I(sdp->sd_statfs_inode);

	struct gfs2_inode *l_ip = GFS2_I(sdp->sd_sc_inode);

	struct gfs2_statfs_change_host *m_sc = &sdp->sd_statfs_master;
@@ -712,8 +713,8 @@ static int gfs2_make_fs_ro(struct gfs2_sbd *sdp) 
	int error;



	flush_workqueue(gfs2_delete_workqueue);

	gfs2_quota_sync(sdp);

	gfs2_statfs_sync(sdp);

	gfs2_quota_sync(sdp->sd_vfs, 0);

	gfs2_statfs_sync(sdp->sd_vfs, 0);



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

				   &t_gh);

fs/gfs2/super.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ extern void gfs2_statfs_change_in(struct gfs2_statfs_change_host *sc, 
				  const void *buf);

extern void update_statfs(struct gfs2_sbd *sdp, struct buffer_head *m_bh,

			  struct buffer_head *l_bh);

extern int gfs2_statfs_sync(struct gfs2_sbd *sdp);

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



extern int gfs2_freeze_fs(struct gfs2_sbd *sdp);

extern void gfs2_unfreeze_fs(struct gfs2_sbd *sdp);

fs/gfs2/sys.c

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

		return -EINVAL;



	gfs2_statfs_sync(sdp);

	gfs2_statfs_sync(sdp->sd_vfs, 0);

	return len;

}
@@ -171,7 +171,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);

	gfs2_quota_sync(sdp->sd_vfs, 0);

	return len;

}