lkml.org 
[lkml]   [2010]   [Jan]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 02/10] hpfs: Convert sbi->hpfs_creation_de to mutex
    The sbi->hpfs_creation_de semaphore is used as mutex. Convert it to a
    real mutex.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    ---
    fs/hpfs/buffer.c | 4 ++--
    fs/hpfs/hpfs_fn.h | 2 +-
    fs/hpfs/super.c | 2 +-
    3 files changed, 4 insertions(+), 4 deletions(-)

    Index: linux-2.6-tip/fs/hpfs/buffer.c
    ===================================================================
    --- linux-2.6-tip.orig/fs/hpfs/buffer.c
    +++ linux-2.6-tip/fs/hpfs/buffer.c
    @@ -13,7 +13,7 @@ void hpfs_lock_creation(struct super_blo
    #ifdef DEBUG_LOCKS
    printk("lock creation\n");
    #endif
    - down(&hpfs_sb(s)->hpfs_creation_de);
    + mutex_lock(&hpfs_sb(s)->hpfs_creation_de);
    }

    void hpfs_unlock_creation(struct super_block *s)
    @@ -21,7 +21,7 @@ void hpfs_unlock_creation(struct super_b
    #ifdef DEBUG_LOCKS
    printk("unlock creation\n");
    #endif
    - up(&hpfs_sb(s)->hpfs_creation_de);
    + mutex_unlock(&hpfs_sb(s)->hpfs_creation_de);
    }

    /* Map a sector into a buffer and return pointers to it and to the buffer. */
    Index: linux-2.6-tip/fs/hpfs/hpfs_fn.h
    ===================================================================
    --- linux-2.6-tip.orig/fs/hpfs/hpfs_fn.h
    +++ linux-2.6-tip/fs/hpfs/hpfs_fn.h
    @@ -87,7 +87,7 @@ struct hpfs_sb_info {
    unsigned *sb_bmp_dir; /* main bitmap directory */
    unsigned sb_c_bitmap; /* current bitmap */
    unsigned sb_max_fwd_alloc; /* max forwad allocation */
    - struct semaphore hpfs_creation_de; /* when creating dirents, nobody else
    + struct mutex hpfs_creation_de; /* when creating dirents, nobody else
    can alloc blocks */
    /*unsigned sb_mounting : 1;*/
    int sb_timeshift;
    Index: linux-2.6-tip/fs/hpfs/super.c
    ===================================================================
    --- linux-2.6-tip.orig/fs/hpfs/super.c
    +++ linux-2.6-tip/fs/hpfs/super.c
    @@ -486,7 +486,7 @@ static int hpfs_fill_super(struct super_
    sbi->sb_bmp_dir = NULL;
    sbi->sb_cp_table = NULL;

    - init_MUTEX(&sbi->hpfs_creation_de);
    + mutex_init(&sbi->hpfs_creation_de);

    uid = current_uid();
    gid = current_gid();



    \
     
     \ /
      Last update: 2010-01-29 21:43    [W:0.021 / U:31.220 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site