aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/gfs2/ondisk.c2
-rw-r--r--fs/gfs2/quota.c2
-rw-r--r--include/linux/gfs2_ondisk.h9
3 files changed, 9 insertions, 4 deletions
diff --git a/fs/gfs2/ondisk.c b/fs/gfs2/ondisk.c
index 32f592f4a3c0..5db0737fcdb5 100644
--- a/fs/gfs2/ondisk.c
+++ b/fs/gfs2/ondisk.c
@@ -144,7 +144,7 @@ void gfs2_rgrp_out(const struct gfs2_rgrp_host *rg, void *buf)
144 memset(&str->rg_reserved, 0, sizeof(str->rg_reserved)); 144 memset(&str->rg_reserved, 0, sizeof(str->rg_reserved));
145} 145}
146 146
147void gfs2_quota_in(struct gfs2_quota *qu, const void *buf) 147void gfs2_quota_in(struct gfs2_quota_host *qu, const void *buf)
148{ 148{
149 const struct gfs2_quota *str = buf; 149 const struct gfs2_quota *str = buf;
150 150
diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index a3deae7416c9..e3f5b8da484c 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -743,7 +743,7 @@ static int do_glock(struct gfs2_quota_data *qd, int force_refresh,
743 struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd; 743 struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd;
744 struct gfs2_inode *ip = GFS2_I(sdp->sd_quota_inode); 744 struct gfs2_inode *ip = GFS2_I(sdp->sd_quota_inode);
745 struct gfs2_holder i_gh; 745 struct gfs2_holder i_gh;
746 struct gfs2_quota q; 746 struct gfs2_quota_host q;
747 char buf[sizeof(struct gfs2_quota)]; 747 char buf[sizeof(struct gfs2_quota)];
748 struct file_ra_state ra_state; 748 struct file_ra_state ra_state;
749 int error; 749 int error;
diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h
index b16df6e8f55c..431e03b85458 100644
--- a/include/linux/gfs2_ondisk.h
+++ b/include/linux/gfs2_ondisk.h
@@ -232,6 +232,12 @@ struct gfs2_quota {
232 __u8 qu_reserved[64]; 232 __u8 qu_reserved[64];
233}; 233};
234 234
235struct gfs2_quota_host {
236 __u64 qu_limit;
237 __u64 qu_warn;
238 __u64 qu_value;
239};
240
235/* 241/*
236 * dinode structure 242 * dinode structure
237 */ 243 */
@@ -515,8 +521,7 @@ extern void gfs2_rindex_in(struct gfs2_rindex_host *ri, const void *buf);
515extern void gfs2_rindex_out(const struct gfs2_rindex_host *ri, void *buf); 521extern void gfs2_rindex_out(const struct gfs2_rindex_host *ri, void *buf);
516extern void gfs2_rgrp_in(struct gfs2_rgrp_host *rg, const void *buf); 522extern void gfs2_rgrp_in(struct gfs2_rgrp_host *rg, const void *buf);
517extern void gfs2_rgrp_out(const struct gfs2_rgrp_host *rg, void *buf); 523extern void gfs2_rgrp_out(const struct gfs2_rgrp_host *rg, void *buf);
518extern void gfs2_quota_in(struct gfs2_quota *qu, const void *buf); 524extern void gfs2_quota_in(struct gfs2_quota_host *qu, const void *buf);
519extern void gfs2_quota_out(const struct gfs2_quota *qu, void *buf);
520extern void gfs2_dinode_in(struct gfs2_dinode_host *di, const void *buf); 525extern void gfs2_dinode_in(struct gfs2_dinode_host *di, const void *buf);
521extern void gfs2_dinode_out(const struct gfs2_dinode_host *di, void *buf); 526extern void gfs2_dinode_out(const struct gfs2_dinode_host *di, void *buf);
522extern void gfs2_ea_header_in(struct gfs2_ea_header *ea, const void *buf); 527extern void gfs2_ea_header_in(struct gfs2_ea_header *ea, const void *buf);