Merge branch 'linus'

1 files changed, 3 insertions, 3 deletions

diff --git a/fs/fat/fatent.c b/fs/fat/fatent.c
index a1a9e0451217..ab171ea8e869 100644
--- a/fs/fat/fatent.c
+++ b/fs/fat/fatent.c
@@ -267,19 +267,19 @@ static struct fatent_operations fat32_ops = {
 
 static inline void lock_fat(struct msdos_sb_info *sbi)
 {
-        down(&sbi->fat_lock);
+        mutex_lock(&sbi->fat_lock);
 }
 
 static inline void unlock_fat(struct msdos_sb_info *sbi)
 {
-        up(&sbi->fat_lock);
+        mutex_unlock(&sbi->fat_lock);
 }
 
 void fat_ent_access_init(struct super_block *sb)
 {
         struct msdos_sb_info *sbi = MSDOS_SB(sb);
 
-        init_MUTEX(&sbi->fat_lock);
+        mutex_init(&sbi->fat_lock);
 
         switch (sbi->fat_bits) {
         case 32: