aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/quota.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/gfs2/quota.c')
-rw-r--r--fs/gfs2/quota.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index 2e9b9326bfc9..ed9e1971b2cd 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -1069,8 +1069,9 @@ void gfs2_quota_change(struct gfs2_inode *ip, s64 change,
1069 } 1069 }
1070} 1070}
1071 1071
1072int gfs2_quota_sync(struct gfs2_sbd *sdp) 1072int gfs2_quota_sync(struct super_block *sb, int type)
1073{ 1073{
1074 struct gfs2_sbd *sdp = sb->s_fs_info;
1074 struct gfs2_quota_data **qda; 1075 struct gfs2_quota_data **qda;
1075 unsigned int max_qd = gfs2_tune_get(sdp, gt_quota_simul_sync); 1076 unsigned int max_qd = gfs2_tune_get(sdp, gt_quota_simul_sync);
1076 unsigned int num_qd; 1077 unsigned int num_qd;
@@ -1298,12 +1299,12 @@ static void quotad_error(struct gfs2_sbd *sdp, const char *msg, int error)
1298} 1299}
1299 1300
1300static void quotad_check_timeo(struct gfs2_sbd *sdp, const char *msg, 1301static void quotad_check_timeo(struct gfs2_sbd *sdp, const char *msg,
1301 int (*fxn)(struct gfs2_sbd *sdp), 1302 int (*fxn)(struct super_block *sb, int type),
1302 unsigned long t, unsigned long *timeo, 1303 unsigned long t, unsigned long *timeo,
1303 unsigned int *new_timeo) 1304 unsigned int *new_timeo)
1304{ 1305{
1305 if (t >= *timeo) { 1306 if (t >= *timeo) {
1306 int error = fxn(sdp); 1307 int error = fxn(sdp->sd_vfs, 0);
1307 quotad_error(sdp, msg, error); 1308 quotad_error(sdp, msg, error);
1308 *timeo = gfs2_tune_get_i(&sdp->sd_tune, new_timeo) * HZ; 1309 *timeo = gfs2_tune_get_i(&sdp->sd_tune, new_timeo) * HZ;
1309 } else { 1310 } else {