aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/super.c
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-09-04 12:49:07 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-09-04 12:49:07 -0400
commitcd915493fce912f1bd838ee1250737ecf33b8fae (patch)
treee14ec6643de91f473edb26a89905e710596fe6bc /fs/gfs2/super.c
parenta91ea69ffd3f8a0b7139bfd44042ab384461e631 (diff)
[GFS2] Change all types to uX style
This makes all fixed size types have consistent names. Cc: Jan Engelhardt <jengelh@linux01.gwdg.de> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/super.c')
-rw-r--r--fs/gfs2/super.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 520266c2044b..f1d07d987c7b 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -33,11 +33,11 @@
33#include "trans.h" 33#include "trans.h"
34#include "util.h" 34#include "util.h"
35 35
36static const uint32_t gfs2_old_fs_formats[] = { 36static const u32 gfs2_old_fs_formats[] = {
37 0 37 0
38}; 38};
39 39
40static const uint32_t gfs2_old_multihost_formats[] = { 40static const u32 gfs2_old_multihost_formats[] = {
41 0 41 0
42}; 42};
43 43
@@ -225,8 +225,8 @@ static struct page *gfs2_read_super(struct super_block *sb, sector_t sector)
225 225
226int gfs2_read_sb(struct gfs2_sbd *sdp, struct gfs2_glock *gl, int silent) 226int gfs2_read_sb(struct gfs2_sbd *sdp, struct gfs2_glock *gl, int silent)
227{ 227{
228 uint32_t hash_blocks, ind_blocks, leaf_blocks; 228 u32 hash_blocks, ind_blocks, leaf_blocks;
229 uint32_t tmp_blocks; 229 u32 tmp_blocks;
230 unsigned int x; 230 unsigned int x;
231 int error; 231 int error;
232 struct page *page; 232 struct page *page;
@@ -251,20 +251,20 @@ int gfs2_read_sb(struct gfs2_sbd *sdp, struct gfs2_glock *gl, int silent)
251 GFS2_BASIC_BLOCK_SHIFT; 251 GFS2_BASIC_BLOCK_SHIFT;
252 sdp->sd_fsb2bb = 1 << sdp->sd_fsb2bb_shift; 252 sdp->sd_fsb2bb = 1 << sdp->sd_fsb2bb_shift;
253 sdp->sd_diptrs = (sdp->sd_sb.sb_bsize - 253 sdp->sd_diptrs = (sdp->sd_sb.sb_bsize -
254 sizeof(struct gfs2_dinode)) / sizeof(uint64_t); 254 sizeof(struct gfs2_dinode)) / sizeof(u64);
255 sdp->sd_inptrs = (sdp->sd_sb.sb_bsize - 255 sdp->sd_inptrs = (sdp->sd_sb.sb_bsize -
256 sizeof(struct gfs2_meta_header)) / sizeof(uint64_t); 256 sizeof(struct gfs2_meta_header)) / sizeof(u64);
257 sdp->sd_jbsize = sdp->sd_sb.sb_bsize - sizeof(struct gfs2_meta_header); 257 sdp->sd_jbsize = sdp->sd_sb.sb_bsize - sizeof(struct gfs2_meta_header);
258 sdp->sd_hash_bsize = sdp->sd_sb.sb_bsize / 2; 258 sdp->sd_hash_bsize = sdp->sd_sb.sb_bsize / 2;
259 sdp->sd_hash_bsize_shift = sdp->sd_sb.sb_bsize_shift - 1; 259 sdp->sd_hash_bsize_shift = sdp->sd_sb.sb_bsize_shift - 1;
260 sdp->sd_hash_ptrs = sdp->sd_hash_bsize / sizeof(uint64_t); 260 sdp->sd_hash_ptrs = sdp->sd_hash_bsize / sizeof(u64);
261 sdp->sd_qc_per_block = (sdp->sd_sb.sb_bsize - 261 sdp->sd_qc_per_block = (sdp->sd_sb.sb_bsize -
262 sizeof(struct gfs2_meta_header)) / 262 sizeof(struct gfs2_meta_header)) /
263 sizeof(struct gfs2_quota_change); 263 sizeof(struct gfs2_quota_change);
264 264
265 /* Compute maximum reservation required to add a entry to a directory */ 265 /* Compute maximum reservation required to add a entry to a directory */
266 266
267 hash_blocks = DIV_ROUND_UP(sizeof(uint64_t) * (1 << GFS2_DIR_MAX_DEPTH), 267 hash_blocks = DIV_ROUND_UP(sizeof(u64) * (1 << GFS2_DIR_MAX_DEPTH),
268 sdp->sd_jbsize); 268 sdp->sd_jbsize);
269 269
270 ind_blocks = 0; 270 ind_blocks = 0;
@@ -281,8 +281,8 @@ int gfs2_read_sb(struct gfs2_sbd *sdp, struct gfs2_glock *gl, int silent)
281 sizeof(struct gfs2_dinode); 281 sizeof(struct gfs2_dinode);
282 sdp->sd_heightsize[1] = sdp->sd_sb.sb_bsize * sdp->sd_diptrs; 282 sdp->sd_heightsize[1] = sdp->sd_sb.sb_bsize * sdp->sd_diptrs;
283 for (x = 2;; x++) { 283 for (x = 2;; x++) {
284 uint64_t space, d; 284 u64 space, d;
285 uint32_t m; 285 u32 m;
286 286
287 space = sdp->sd_heightsize[x - 1] * sdp->sd_inptrs; 287 space = sdp->sd_heightsize[x - 1] * sdp->sd_inptrs;
288 d = space; 288 d = space;
@@ -299,8 +299,8 @@ int gfs2_read_sb(struct gfs2_sbd *sdp, struct gfs2_glock *gl, int silent)
299 sizeof(struct gfs2_dinode); 299 sizeof(struct gfs2_dinode);
300 sdp->sd_jheightsize[1] = sdp->sd_jbsize * sdp->sd_diptrs; 300 sdp->sd_jheightsize[1] = sdp->sd_jbsize * sdp->sd_diptrs;
301 for (x = 2;; x++) { 301 for (x = 2;; x++) {
302 uint64_t space, d; 302 u64 space, d;
303 uint32_t m; 303 u32 m;
304 304
305 space = sdp->sd_jheightsize[x - 1] * sdp->sd_inptrs; 305 space = sdp->sd_jheightsize[x - 1] * sdp->sd_inptrs;
306 d = space; 306 d = space;
@@ -630,8 +630,8 @@ out:
630 return 0; 630 return 0;
631} 631}
632 632
633void gfs2_statfs_change(struct gfs2_sbd *sdp, int64_t total, int64_t free, 633void gfs2_statfs_change(struct gfs2_sbd *sdp, s64 total, s64 free,
634 int64_t dinodes) 634 s64 dinodes)
635{ 635{
636 struct gfs2_inode *l_ip = GFS2_I(sdp->sd_sc_inode); 636 struct gfs2_inode *l_ip = GFS2_I(sdp->sd_sc_inode);
637 struct gfs2_statfs_change *l_sc = &sdp->sd_statfs_local; 637 struct gfs2_statfs_change *l_sc = &sdp->sd_statfs_local;