summaryrefslogtreecommitdiffstats
path: root/fs/gfs2/quota.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-08-03 12:59:38 +0200
committerTakashi Iwai <tiwai@suse.de>2012-08-03 12:59:38 +0200
commitd30a0d839a5a282e43353fee53d5dc70db5eceda (patch)
tree189a91615be3174a9ff8b20937359d11298433af /fs/gfs2/quota.h
parentALSA: emu10k1: Avoid access to invalid pages when period=1 (diff)
parentALSA: isa: Move snd_legacy_find_free_ioport to initval.h (diff)
downloadlinux-d30a0d839a5a282e43353fee53d5dc70db5eceda.tar.xz
linux-d30a0d839a5a282e43353fee53d5dc70db5eceda.zip
Merge branch 'topic/next' into for-next
Diffstat (limited to 'fs/gfs2/quota.h')
-rw-r--r--fs/gfs2/quota.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/quota.h b/fs/gfs2/quota.h
index 90bf1c302a98..f25d98b87904 100644
--- a/fs/gfs2/quota.h
+++ b/fs/gfs2/quota.h
@@ -26,7 +26,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, int wait);
+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);