| From 092e11018704784251cf9b97ad63dc96769fa9ea Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Sat, 25 Jul 2009 23:17:42 +0200 |
| Subject: [PATCH] hpfs: Convert sbi->hpfs_creation_de to mutex |
| |
| commit f0ce033473ed72d35e6275101d8eed4f71c4673d in tip. |
| |
| sbi->hpfs_creation_de is used as mutex so make it a mutex. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Cc: Al Viro <viro@zeniv.linux.org.uk> |
| |
| diff --git a/fs/hpfs/buffer.c b/fs/hpfs/buffer.c |
| index b6fca54..8f4141c 100644 |
| --- a/fs/hpfs/buffer.c |
| +++ b/fs/hpfs/buffer.c |
| @@ -13,7 +13,7 @@ void hpfs_lock_creation(struct super_block *s) |
| #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_block *s) |
| #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. */ |
| diff --git a/fs/hpfs/hpfs_fn.h b/fs/hpfs/hpfs_fn.h |
| index 701ca54..ed222f5 100644 |
| --- a/fs/hpfs/hpfs_fn.h |
| +++ b/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; |
| diff --git a/fs/hpfs/super.c b/fs/hpfs/super.c |
| index cadc4ce..e13f103 100644 |
| --- a/fs/hpfs/super.c |
| +++ b/fs/hpfs/super.c |
| @@ -486,7 +486,7 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent) |
| 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(); |
| -- |
| 1.7.1.1 |
| |