summaryrefslogtreecommitdiffstats
path: root/fs/sysv/balloc.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-01-04 16:03:48 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-01-04 16:03:48 +0000
commit78c388aed2b7184182c08428db1de6c872d815f5 (patch)
tree4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /fs/sysv/balloc.c
parenteb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff)
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'fs/sysv/balloc.c')
-rw-r--r--fs/sysv/balloc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/sysv/balloc.c b/fs/sysv/balloc.c
index 5fa82929b..375ff6f75 100644
--- a/fs/sysv/balloc.c
+++ b/fs/sysv/balloc.c
@@ -52,8 +52,8 @@ void sysv_free_block(struct super_block * sb, unsigned int block)
* into this block being freed:
*/
if (*sb->sv_sb_flc_count == sb->sv_flc_size) {
- unsigned short * flc_count;
- unsigned long * flc_blocks;
+ u16 * flc_count;
+ u32 * flc_blocks;
bh = sv_getblk(sb, sb->s_dev, block);
if (!bh) {
@@ -154,8 +154,8 @@ int sysv_new_block(struct super_block * sb)
return 0;
}
if (*sb->sv_sb_flc_count == 0) { /* the last block continues the free list */
- unsigned short * flc_count;
- unsigned long * flc_blocks;
+ u16 * flc_count;
+ u32 * flc_blocks;
if (!(bh = sv_bread(sb, sb->s_dev, block))) {
printk("sysv_new_block: cannot read free-list block\n");
@@ -247,8 +247,8 @@ unsigned long sysv_count_free_blocks(struct super_block * sb)
}
/* block = sb->sv_sb_flc_blocks[0], the last block continues the free list */
while (1) {
- unsigned short * flc_count;
- unsigned long * flc_blocks;
+ u16 * flc_count;
+ u32 * flc_blocks;
if (block < sb->sv_firstdatazone || block >= sb->sv_nzones) {
printk("sysv_count_free_blocks: new block %d is not in data zone\n",block);