aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/gfs2/inode.c4
-rw-r--r--fs/gfs2/ondisk.c4
-rw-r--r--include/linux/gfs2_ondisk.h9
3 files changed, 11 insertions, 6 deletions
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 191a3df93d67..7eb6b440da6d 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -436,7 +436,7 @@ static int pick_formal_ino_1(struct gfs2_sbd *sdp, u64 *formal_ino)
436{ 436{
437 struct gfs2_inode *ip = GFS2_I(sdp->sd_ir_inode); 437 struct gfs2_inode *ip = GFS2_I(sdp->sd_ir_inode);
438 struct buffer_head *bh; 438 struct buffer_head *bh;
439 struct gfs2_inum_range ir; 439 struct gfs2_inum_range_host ir;
440 int error; 440 int error;
441 441
442 error = gfs2_trans_begin(sdp, RES_DINODE, 0); 442 error = gfs2_trans_begin(sdp, RES_DINODE, 0);
@@ -479,7 +479,7 @@ static int pick_formal_ino_2(struct gfs2_sbd *sdp, u64 *formal_ino)
479 struct gfs2_inode *m_ip = GFS2_I(sdp->sd_inum_inode); 479 struct gfs2_inode *m_ip = GFS2_I(sdp->sd_inum_inode);
480 struct gfs2_holder gh; 480 struct gfs2_holder gh;
481 struct buffer_head *bh; 481 struct buffer_head *bh;
482 struct gfs2_inum_range ir; 482 struct gfs2_inum_range_host ir;
483 int error; 483 int error;
484 484
485 error = gfs2_glock_nq_init(m_ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh); 485 error = gfs2_glock_nq_init(m_ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh);
diff --git a/fs/gfs2/ondisk.c b/fs/gfs2/ondisk.c
index 3b156a15cd8d..64f5f0c604aa 100644
--- a/fs/gfs2/ondisk.c
+++ b/fs/gfs2/ondisk.c
@@ -263,7 +263,7 @@ void gfs2_log_header_in(struct gfs2_log_header *lh, const void *buf)
263 lh->lh_hash = be32_to_cpu(str->lh_hash); 263 lh->lh_hash = be32_to_cpu(str->lh_hash);
264} 264}
265 265
266void gfs2_inum_range_in(struct gfs2_inum_range *ir, const void *buf) 266void gfs2_inum_range_in(struct gfs2_inum_range_host *ir, const void *buf)
267{ 267{
268 const struct gfs2_inum_range *str = buf; 268 const struct gfs2_inum_range *str = buf;
269 269
@@ -271,7 +271,7 @@ void gfs2_inum_range_in(struct gfs2_inum_range *ir, const void *buf)
271 ir->ir_length = be64_to_cpu(str->ir_length); 271 ir->ir_length = be64_to_cpu(str->ir_length);
272} 272}
273 273
274void gfs2_inum_range_out(const struct gfs2_inum_range *ir, void *buf) 274void gfs2_inum_range_out(const struct gfs2_inum_range_host *ir, void *buf)
275{ 275{
276 struct gfs2_inum_range *str = buf; 276 struct gfs2_inum_range *str = buf;
277 277
diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h
index e4ca6e4176bb..c035587d066e 100644
--- a/include/linux/gfs2_ondisk.h
+++ b/include/linux/gfs2_ondisk.h
@@ -445,6 +445,11 @@ struct gfs2_inum_range {
445 __be64 ir_length; 445 __be64 ir_length;
446}; 446};
447 447
448struct gfs2_inum_range_host {
449 __u64 ir_start;
450 __u64 ir_length;
451};
452
448/* 453/*
449 * Statfs change 454 * Statfs change
450 * Describes an change to the pool of free and allocated 455 * Describes an change to the pool of free and allocated
@@ -488,8 +493,8 @@ extern void gfs2_dinode_out(const struct gfs2_dinode_host *di, void *buf);
488extern void gfs2_ea_header_in(struct gfs2_ea_header *ea, const void *buf); 493extern void gfs2_ea_header_in(struct gfs2_ea_header *ea, const void *buf);
489extern void gfs2_ea_header_out(const struct gfs2_ea_header *ea, void *buf); 494extern void gfs2_ea_header_out(const struct gfs2_ea_header *ea, void *buf);
490extern void gfs2_log_header_in(struct gfs2_log_header *lh, const void *buf); 495extern void gfs2_log_header_in(struct gfs2_log_header *lh, const void *buf);
491extern void gfs2_inum_range_in(struct gfs2_inum_range *ir, const void *buf); 496extern void gfs2_inum_range_in(struct gfs2_inum_range_host *ir, const void *buf);
492extern void gfs2_inum_range_out(const struct gfs2_inum_range *ir, void *buf); 497extern void gfs2_inum_range_out(const struct gfs2_inum_range_host *ir, void *buf);
493extern void gfs2_statfs_change_in(struct gfs2_statfs_change *sc, const void *buf); 498extern void gfs2_statfs_change_in(struct gfs2_statfs_change *sc, const void *buf);
494extern void gfs2_statfs_change_out(const struct gfs2_statfs_change *sc, void *buf); 499extern void gfs2_statfs_change_out(const struct gfs2_statfs_change *sc, void *buf);
495extern void gfs2_quota_change_in(struct gfs2_quota_change *qc, const void *buf); 500extern void gfs2_quota_change_in(struct gfs2_quota_change *qc, const void *buf);