split and annotate gfs_rindex [10/70]
From 1e81c4c3e0f55c95b6278a827262b80debd0dc7e Mon Sep 17 00:00:00 2001
From: Al Viro <[email protected]>
Date: Fri, 13 Oct 2006 22:51:24 -0400
Subject: [PATCH] [GFS2] split and annotate gfs_rindex
Signed-off-by Al Viro <[email protected]>
Signed-off-by Steven Whitehouse <[email protected]>
--- fs/gfs2/incore.h | 2 +- fs/gfs2/ondisk.c | 4 ++-- fs/gfs2/rgrp.c | 2 +- include/linux/gfs2_ondisk.h | 14 +++++++++++--- 4 files changed, 15 insertions(+), 7 deletions(-)
fs/gfs2/incore.h +1 -1
@@ -67,7 +67,7 @@ struct gfs2_rgrpd {struct list_head rd_list_mru;struct list_head rd_recent;/* Recently used rgrps */ struct gfs2_glock *rd_gl;/* Glock for this rgrp */ -struct gfs2_rindex rd_ri; +struct gfs2_rindex_host rd_ri;struct gfs2_rgrp_host rd_rg;u64 rd_rg_vn;struct gfs2_bitmap *rd_bits;
fs/gfs2/ondisk.c +2 -2
@@ -97,7 +97,7 @@ void gfs2_sb_in(struct gfs2_sb_host *sb,memcpy (sb->sb_locktable, str->sb_locktable,GFS2_LOCKNAME_LEN ); } -void gfs2_rindex_in (struct gfs2_rindex *ri,const void *buf) +void gfs2_rindex_in (struct gfs2_rindex_host *ri,const void *buf) {const struct gfs2_rindex *str = buf;
@@ -109,7 +109,7 @@ void gfs2_rindex_in(struct gfs2_rindex * } -void gfs2_rindex_print (const struct gfs2_rindex *ri) +void gfs2_rindex_print (const struct gfs2_rindex_host *ri) {printk (KERN_INFO " ri_addr = %llu\n" , (unsigned long long )ri->ri_addr);pv (ri, ri_length,"%u" );
fs/gfs2/rgrp.c +1 -1
@@ -253,7 +253,7 @@ void gfs2_rgrp_verify(struct gfs2_rgrpd } -static inline int rgrp_contains_block (struct gfs2_rindex *ri,u64 block) +static inline int rgrp_contains_block (struct gfs2_rindex_host *ri,u64 block) {u64 first = ri->ri_data0;u64 last = first + ri->ri_data;
include/linux/gfs2_ondisk.h +11 -3
@@ -168,6 +168,14 @@ struct gfs2_rindex {__u8 ri_reserved[64 ]; }; +struct gfs2_rindex_host { +__u64 ri_addr;/* grp block disk address */ +__u64 ri_data0;/* first data location */ +__u32 ri_length;/* length of rgrp header in fs blocks */ +__u32 ri_data;/* num of data blocks in rgrp */ +__u32 ri_bitbytes;/* number of bytes in data bitmaps */ +}; +/* * resource group header structure */
@@ -498,8 +506,8 @@ #ifdef __KERNEL__extern void gfs2_inum_in (struct gfs2_inum *no,const void *buf);extern void gfs2_inum_out (const struct gfs2_inum *no,void *buf);extern void gfs2_sb_in (struct gfs2_sb_host *sb,const void *buf); -extern void gfs2_rindex_in (struct gfs2_rindex *ri,const void *buf); -extern void gfs2_rindex_out (const struct gfs2_rindex *ri,void *buf); +extern void gfs2_rindex_in (struct gfs2_rindex_host *ri,const void *buf); +extern void gfs2_rindex_out (const struct gfs2_rindex_host *ri,void *buf);extern void gfs2_rgrp_in (struct gfs2_rgrp_host *rg,const void *buf);extern void gfs2_rgrp_out (const struct gfs2_rgrp_host *rg,void *buf);extern void gfs2_quota_in (struct gfs2_quota *qu,const void *buf);
@@ -517,7 +525,7 @@ extern void gfs2_quota_change_in(struct/* Printing functions */ -extern void gfs2_rindex_print (const struct gfs2_rindex *ri); +extern void gfs2_rindex_print (const struct gfs2_rindex_host *ri);extern void gfs2_dinode_print (const struct gfs2_dinode_host *di);#endif /* __KERNEL__ */
Signature · 1 line
1.4.1