Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...

[linux-2.6] / fs / fat / fatent.c

diff --git a/fs/fat/fatent.c b/fs/fat/fatent.c
index 20a22875f0a1b4b84cc3e144ebbc228ab92f394f..ab171ea8e869b2cc9da6369abad3a83c970d2a96 100644 (file)
--- 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:
@@ -581,7 +581,7 @@ error:
        return err;
 }
 
-EXPORT_SYMBOL(fat_free_clusters);
+EXPORT_SYMBOL_GPL(fat_free_clusters);
 
 int fat_count_free_clusters(struct super_block *sb)
 {