git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
fs
/
sysv
/
balloc.c
diff --git
a/fs/sysv/balloc.c
b/fs/sysv/balloc.c
index
8184570
..
9a6ad96
100644
(file)
--- a/
fs/sysv/balloc.c
+++ b/
fs/sysv/balloc.c
@@
-27,23
+27,23
@@
sb->sv_sbd2->s_tfree = *sb->sv_free_blocks
but we nevertheless keep it up to date. */
sb->sv_sbd2->s_tfree = *sb->sv_free_blocks
but we nevertheless keep it up to date. */
-static inline
u32
*get_chunk(struct super_block *sb, struct buffer_head *bh)
+static inline
sysv_zone_t
*get_chunk(struct super_block *sb, struct buffer_head *bh)
{
char *bh_data = bh->b_data;
if (SYSV_SB(sb)->s_type == FSTYPE_SYSV4)
{
char *bh_data = bh->b_data;
if (SYSV_SB(sb)->s_type == FSTYPE_SYSV4)
- return (
u32
*)(bh_data+4);
+ return (
sysv_zone_t
*)(bh_data+4);
else
else
- return (
u32
*)(bh_data+2);
+ return (
sysv_zone_t
*)(bh_data+2);
}
/* NOTE NOTE NOTE: nr is a block number _as_ _stored_ _on_ _disk_ */
}
/* NOTE NOTE NOTE: nr is a block number _as_ _stored_ _on_ _disk_ */
-void sysv_free_block(struct super_block * sb,
u32
nr)
+void sysv_free_block(struct super_block * sb,
sysv_zone_t
nr)
{
struct sysv_sb_info * sbi = SYSV_SB(sb);
struct buffer_head * bh;
{
struct sysv_sb_info * sbi = SYSV_SB(sb);
struct buffer_head * bh;
-
u32
*blocks = sbi->s_bcache;
+
sysv_zone_t
*blocks = sbi->s_bcache;
unsigned count;
unsigned block = fs32_to_cpu(sbi, nr);
unsigned count;
unsigned block = fs32_to_cpu(sbi, nr);
@@
-81,7
+81,7
@@
void sysv_free_block(struct super_block * sb, u32 nr)
return;
}
memset(bh->b_data, 0, sb->s_blocksize);
return;
}
memset(bh->b_data, 0, sb->s_blocksize);
- *(
u
16*)bh->b_data = cpu_to_fs16(sbi, count);
+ *(
__fs
16*)bh->b_data = cpu_to_fs16(sbi, count);
memcpy(get_chunk(sb,bh), blocks, count * sizeof(sysv_zone_t));
mark_buffer_dirty(bh);
set_buffer_uptodate(bh);
memcpy(get_chunk(sb,bh), blocks, count * sizeof(sysv_zone_t));
mark_buffer_dirty(bh);
set_buffer_uptodate(bh);
@@
-96,11
+96,11
@@
void sysv_free_block(struct super_block * sb, u32 nr)
unlock_super(sb);
}
unlock_super(sb);
}
-
u32
sysv_new_block(struct super_block * sb)
+
sysv_zone_t
sysv_new_block(struct super_block * sb)
{
struct sysv_sb_info *sbi = SYSV_SB(sb);
unsigned int block;
{
struct sysv_sb_info *sbi = SYSV_SB(sb);
unsigned int block;
-
u32
nr;
+
sysv_zone_t
nr;
struct buffer_head * bh;
unsigned count;
struct buffer_head * bh;
unsigned count;
@@
-133,7
+133,7
@@
u32 sysv_new_block(struct super_block * sb)
*sbi->s_bcache_count = cpu_to_fs16(sbi, 1);
goto Enospc;
}
*sbi->s_bcache_count = cpu_to_fs16(sbi, 1);
goto Enospc;
}
- count = fs16_to_cpu(sbi, *(
u
16*)bh->b_data);
+ count = fs16_to_cpu(sbi, *(
__fs
16*)bh->b_data);
if (count > sbi->s_flc_size) {
printk("sysv_new_block: free-list block with >flc_size entries\n");
brelse(bh);
if (count > sbi->s_flc_size) {
printk("sysv_new_block: free-list block with >flc_size entries\n");
brelse(bh);
@@
-161,7
+161,7
@@
unsigned long sysv_count_free_blocks(struct super_block * sb)
int sb_count;
int count;
struct buffer_head * bh = NULL;
int sb_count;
int count;
struct buffer_head * bh = NULL;
-
u32
*blocks;
+
sysv_zone_t
*blocks;
unsigned block;
int n;
unsigned block;
int n;
@@
-184,15
+184,16
@@
unsigned long sysv_count_free_blocks(struct super_block * sb)
n = fs16_to_cpu(sbi, *sbi->s_bcache_count);
blocks = sbi->s_bcache;
while (1) {
n = fs16_to_cpu(sbi, *sbi->s_bcache_count);
blocks = sbi->s_bcache;
while (1) {
+ sysv_zone_t zone;
if (n > sbi->s_flc_size)
goto E2big;
if (n > sbi->s_flc_size)
goto E2big;
-
block
= 0;
- while (n && (
block
= blocks[--n]) != 0)
+
zone
= 0;
+ while (n && (
zone
= blocks[--n]) != 0)
count++;
count++;
- if (
block
== 0)
+ if (
zone
== 0)
break;
break;
- block = fs32_to_cpu(sbi,
block
);
+ block = fs32_to_cpu(sbi,
zone
);
if (bh)
brelse(bh);
if (bh)
brelse(bh);
@@
-202,7
+203,7
@@
unsigned long sysv_count_free_blocks(struct super_block * sb)
bh = sb_bread(sb, block);
if (!bh)
goto Eio;
bh = sb_bread(sb, block);
if (!bh)
goto Eio;
- n = fs16_to_cpu(sbi, *(
u
16*)bh->b_data);
+ n = fs16_to_cpu(sbi, *(
__fs
16*)bh->b_data);
blocks = get_chunk(sb, bh);
}
if (bh)
blocks = get_chunk(sb, bh);
}
if (bh)