aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2010-07-27 11:56:04 -0400
committerTheodore Ts'o <tytso@mit.edu>2010-07-27 11:56:04 -0400
commite5880d76aea443b04e07da19830da0f6f7494eef (patch)
tree24ad55c300a63170ffcf5a777dc737c67d80e00c /fs/ext4
parent89eeddf03327e19cfcbb18efa98e5470e2f5c563 (diff)
ext4: fix potential NULL dereference while tracing
The allocation_context pointer can be NULL. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/mballoc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 3dfad95f0f98..8b3b9344a595 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -3575,7 +3575,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
3575 trace_ext4_mballoc_discard(ac); 3575 trace_ext4_mballoc_discard(ac);
3576 } 3576 }
3577 3577
3578 trace_ext4_mb_release_inode_pa(ac, pa, grp_blk_start + bit, 3578 trace_ext4_mb_release_inode_pa(sb, ac, pa, grp_blk_start + bit,
3579 next - bit); 3579 next - bit);
3580 mb_free_blocks(pa->pa_inode, e4b, bit, next - bit); 3580 mb_free_blocks(pa->pa_inode, e4b, bit, next - bit);
3581 bit = next + 1; 3581 bit = next + 1;
@@ -3606,7 +3606,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
3606 ext4_group_t group; 3606 ext4_group_t group;
3607 ext4_grpblk_t bit; 3607 ext4_grpblk_t bit;
3608 3608
3609 trace_ext4_mb_release_group_pa(ac, pa); 3609 trace_ext4_mb_release_group_pa(sb, ac, pa);
3610 BUG_ON(pa->pa_deleted == 0); 3610 BUG_ON(pa->pa_deleted == 0);
3611 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit); 3611 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
3612 BUG_ON(group != e4b->bd_group && pa->pa_len != 0); 3612 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);