Commit 60ee061e authored by Roman Zippel's avatar Roman Zippel Committed by Linus Torvalds

[PATCH] m68k: AFFS update [1/20]

- sizeof changes from Kernel Janitor Project
- several bug fixes found with fsx
parent 3981b9e7
...@@ -28,6 +28,12 @@ Known bugs: ...@@ -28,6 +28,12 @@ Known bugs:
Please direct bug reports to: zippel@linux-m68k.org Please direct bug reports to: zippel@linux-m68k.org
Version 3.19
------------
- sizeof changes from Kernel Janitor Project
- several bug fixes found with fsx
Version 3.18 Version 3.18
------------ ------------
......
...@@ -296,7 +296,7 @@ affs_init_bitmap(struct super_block *sb) ...@@ -296,7 +296,7 @@ affs_init_bitmap(struct super_block *sb)
sbi->s_bmap_bits = sb->s_blocksize * 8 - 32; sbi->s_bmap_bits = sb->s_blocksize * 8 - 32;
sbi->s_bmap_count = (sbi->s_partition_size - sbi->s_reserved + sbi->s_bmap_count = (sbi->s_partition_size - sbi->s_reserved +
sbi->s_bmap_bits - 1) / sbi->s_bmap_bits; sbi->s_bmap_bits - 1) / sbi->s_bmap_bits;
size = sbi->s_bmap_count * sizeof(struct affs_bm_info); size = sbi->s_bmap_count * sizeof(*bm);
bm = sbi->s_bitmap = kmalloc(size, GFP_KERNEL); bm = sbi->s_bitmap = kmalloc(size, GFP_KERNEL);
if (!sbi->s_bitmap) { if (!sbi->s_bitmap) {
printk(KERN_ERR "AFFS: Bitmap allocation failed\n"); printk(KERN_ERR "AFFS: Bitmap allocation failed\n");
......
This diff is collapsed.
...@@ -299,7 +299,7 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -299,7 +299,7 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent)
if (!sbi) if (!sbi)
return -ENOMEM; return -ENOMEM;
sb->u.generic_sbp = sbi; sb->u.generic_sbp = sbi;
memset(sbi, 0, sizeof(struct affs_sb_info)); memset(sbi, 0, sizeof(*AFFS_SB));
init_MUTEX(&sbi->s_bmlock); init_MUTEX(&sbi->s_bmlock);
if (!parse_options(data,&uid,&gid,&i,&reserved,&root_block, if (!parse_options(data,&uid,&gid,&i,&reserved,&root_block,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment