---

yaml --- r: 101094 b: refs/heads/master c: 7477827 h: refs/heads/master v: v3
git-mirror · Jul 11, 2008 · daf3f92 · daf3f92
1 parent 12f4595
commit daf3f92
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9c769b769a8bcd70371c71797fc4e407b37ba75
+refs/heads/master: 7477827f6686ce29b6216d9eb26f6b9027742dcc
diff --git a/trunk/fs/ext4/balloc.c b/trunk/fs/ext4/balloc.c
@@ -47,7 +47,7 @@ static int ext4_block_in_group(struct super_block *sb, ext4_fsblk_t block,
 			ext4_group_t block_group)
 {
 	ext4_group_t actual_group;
-	ext4_get_group_no_and_offset(sb, block, &actual_group, 0);
+	ext4_get_group_no_and_offset(sb, block, &actual_group, NULL);
 	if (actual_group == block_group)
 		return 1;
 	return 0;

diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c
@@ -1858,8 +1858,8 @@ static unsigned long ext4_get_stripe_size(struct ext4_sb_info *sbi)
 }
 
 static int ext4_fill_super (struct super_block *sb, void *data, int silent)
-				__releases(kernel_sem)
-				__acquires(kernel_sem)
+				__releases(kernel_lock)
+				__acquires(kernel_lock)
 
 {
 	struct buffer_head * bh;