[ARM] 4363/1: AT91: Remove legacy PIO definitions

[linux-2.6-omap-h63xx.git] / fs / super.c

diff --git a/fs/super.c b/fs/super.c
index f961e03079974a374cdf7476107924e0c2a5ebc0..60b1e50cbf536c25aa6c667567448cf0b4705514 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -285,7 +285,7 @@ int fsync_super(struct super_block *sb)
  */
 void generic_shutdown_super(struct super_block *sb)
 {
-       struct super_operations *sop = sb->s_op;
+       const struct super_operations *sop = sb->s_op;
 
        if (sb->s_root) {
                shrink_dcache_for_umount(sb);
@@ -753,9 +753,9 @@ int get_sb_bdev(struct file_system_type *fs_type,
         * will protect the lockfs code from trying to start a snapshot
         * while we are mounting
         */
-       mutex_lock(&bdev->bd_mount_mutex);
+       down(&bdev->bd_mount_sem);
        s = sget(fs_type, test_bdev_super, set_bdev_super, bdev);
-       mutex_unlock(&bdev->bd_mount_mutex);
+       up(&bdev->bd_mount_sem);
        if (IS_ERR(s))
                goto error_s;