From d7121a367237cee7488de2d997f6bd37cbbe169e Mon Sep 17 00:00:00 2001 From: Steven Whitehouse Date: Mon, 3 Jun 2013 11:12:59 +0100 Subject: [PATCH] --- yaml --- r: 377645 b: refs/heads/master c: edd2e9acc06f1f32ce9acab442d395bacc6c8d7f h: refs/heads/master i: 377643: 640b9b851318145559f5feed1a01f6fa438eb453 v: v3 --- [refs] | 2 +- trunk/fs/gfs2/quota.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 1d530030a8ac..42fbaf3e6b0a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b6f8860e1df8ab318063765892e1a02cc5996c9 +refs/heads/master: edd2e9acc06f1f32ce9acab442d395bacc6c8d7f diff --git a/trunk/fs/gfs2/quota.c b/trunk/fs/gfs2/quota.c index c253b13722e8..3768c2f40e43 100644 --- a/trunk/fs/gfs2/quota.c +++ b/trunk/fs/gfs2/quota.c @@ -1154,11 +1154,6 @@ 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); -} - int gfs2_quota_refresh(struct gfs2_sbd *sdp, struct kqid qid) { struct gfs2_quota_data *qd; @@ -1414,7 +1409,7 @@ int gfs2_quotad(void *data) &tune->gt_statfs_quantum); /* Update quota file */ - quotad_check_timeo(sdp, "sync", gfs2_quota_sync_timeo, t, + quotad_check_timeo(sdp, "sync", gfs2_quota_sync, t, "ad_timeo, &tune->gt_quota_quantum); /* Check for & recover partially truncated inodes */