lkml.org 
[lkml]   [2009]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 27/49] ext4: Fix spinlock assertions on UP systems
    Date
    From: Vincent Minet <vincent@vincent-minet.net>

    On UP systems without DEBUG_SPINLOCK, ext4_is_group_locked always fails
    which triggers a BUG_ON() call.
    This patch fixes it by using assert_spin_locked instead.

    Signed-off-by: Vincent Minet <vincent@vincent-minet.net>
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    ---
    fs/ext4/ext4.h | 6 ------
    fs/ext4/mballoc.c | 10 +++++-----
    2 files changed, 5 insertions(+), 11 deletions(-)

    diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
    index 149e02d..89190ae 100644
    --- a/fs/ext4/ext4.h
    +++ b/fs/ext4/ext4.h
    @@ -1583,12 +1583,6 @@ static inline void ext4_unlock_group(struct super_block *sb,
    spin_unlock(ext4_group_lock_ptr(sb, group));
    }

    -static inline int ext4_is_group_locked(struct super_block *sb,
    - ext4_group_t group)
    -{
    - return spin_is_locked(ext4_group_lock_ptr(sb, group));
    -}
    -
    /*
    * Inodes and files operations
    */
    diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
    index e76459c..541bd9a 100644
    --- a/fs/ext4/mballoc.c
    +++ b/fs/ext4/mballoc.c
    @@ -436,7 +436,7 @@ static void mb_free_blocks_double(struct inode *inode, struct ext4_buddy *e4b,

    if (unlikely(e4b->bd_info->bb_bitmap == NULL))
    return;
    - BUG_ON(!ext4_is_group_locked(sb, e4b->bd_group));
    + assert_spin_locked(ext4_group_lock_ptr(sb, e4b->bd_group));
    for (i = 0; i < count; i++) {
    if (!mb_test_bit(first + i, e4b->bd_info->bb_bitmap)) {
    ext4_fsblk_t blocknr;
    @@ -460,7 +460,7 @@ static void mb_mark_used_double(struct ext4_buddy *e4b, int first, int count)

    if (unlikely(e4b->bd_info->bb_bitmap == NULL))
    return;
    - BUG_ON(!ext4_is_group_locked(e4b->bd_sb, e4b->bd_group));
    + assert_spin_locked(ext4_group_lock_ptr(e4b->bd_sb, e4b->bd_group));
    for (i = 0; i < count; i++) {
    BUG_ON(mb_test_bit(first + i, e4b->bd_info->bb_bitmap));
    mb_set_bit(first + i, e4b->bd_info->bb_bitmap);
    @@ -1115,7 +1115,7 @@ static void mb_free_blocks(struct inode *inode, struct ext4_buddy *e4b,
    struct super_block *sb = e4b->bd_sb;

    BUG_ON(first + count > (sb->s_blocksize << 3));
    - BUG_ON(!ext4_is_group_locked(sb, e4b->bd_group));
    + assert_spin_locked(ext4_group_lock_ptr(sb, e4b->bd_group));
    mb_check_buddy(e4b);
    mb_free_blocks_double(inode, e4b, first, count);

    @@ -1196,7 +1196,7 @@ static int mb_find_extent(struct ext4_buddy *e4b, int order, int block,
    int ord;
    void *buddy;

    - BUG_ON(!ext4_is_group_locked(e4b->bd_sb, e4b->bd_group));
    + assert_spin_locked(ext4_group_lock_ptr(e4b->bd_sb, e4b->bd_group));
    BUG_ON(ex == NULL);

    buddy = mb_find_buddy(e4b, order, &max);
    @@ -1260,7 +1260,7 @@ static int mb_mark_used(struct ext4_buddy *e4b, struct ext4_free_extent *ex)

    BUG_ON(start + len > (e4b->bd_sb->s_blocksize << 3));
    BUG_ON(e4b->bd_group != ex->fe_group);
    - BUG_ON(!ext4_is_group_locked(e4b->bd_sb, e4b->bd_group));
    + assert_spin_locked(ext4_group_lock_ptr(e4b->bd_sb, e4b->bd_group));
    mb_check_buddy(e4b);
    mb_mark_used_double(e4b, start, len);

    --
    1.6.3.2.1.gb9f7d.dirty


    \
     
     \ /
      Last update: 2009-06-08 21:39    [W:0.025 / U:0.044 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site