Merge tag 'xfs-for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc...

[firefly-linux-kernel-4.4.55.git] / fs / ufs / super.c

diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index 098508a93c7b302fe8e6ab65ec7cd753d2515634..f6390eec02cabbe1c8f5751433aa556d9e556829 100644 (file)
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.c
@@ -94,22 +94,6 @@
 #include "swab.h"
 #include "util.h"
 
-void lock_ufs(struct super_block *sb)
-{
-       struct ufs_sb_info *sbi = UFS_SB(sb);
-
-       mutex_lock(&sbi->mutex);
-       sbi->mutex_owner = current;
-}
-
-void unlock_ufs(struct super_block *sb)
-{
-       struct ufs_sb_info *sbi = UFS_SB(sb);
-
-       sbi->mutex_owner = NULL;
-       mutex_unlock(&sbi->mutex);
-}
-
 static struct inode *ufs_nfs_get_inode(struct super_block *sb, u64 ino, u32 generation)
 {
        struct ufs_sb_private_info *uspi = UFS_SB(sb)->s_uspi;
@@ -694,7 +678,7 @@ static int ufs_sync_fs(struct super_block *sb, int wait)
        struct ufs_super_block_third * usb3;
        unsigned flags;
 
-       lock_ufs(sb);
+       mutex_lock(&UFS_SB(sb)->s_lock);
 
        UFSD("ENTER\n");
 
@@ -712,7 +696,7 @@ static int ufs_sync_fs(struct super_block *sb, int wait)
        ufs_put_cstotal(sb);
 
        UFSD("EXIT\n");
-       unlock_ufs(sb);
+       mutex_unlock(&UFS_SB(sb)->s_lock);
 
        return 0;
 }
@@ -756,7 +740,6 @@ static void ufs_put_super(struct super_block *sb)
 
        ubh_brelse_uspi (sbi->s_uspi);
        kfree (sbi->s_uspi);
-       mutex_destroy(&sbi->mutex);
        kfree (sbi);
        sb->s_fs_info = NULL;
        UFSD("EXIT\n");
@@ -799,7 +782,7 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent)
 
        UFSD("flag %u\n", (int)(sb->s_flags & MS_RDONLY));
        
-       mutex_init(&sbi->mutex);
+       mutex_init(&sbi->s_lock);
        spin_lock_init(&sbi->work_lock);
        INIT_DELAYED_WORK(&sbi->sync_work, delayed_sync_fs);
        /*
@@ -1254,7 +1237,6 @@ magic_found:
        return 0;
 
 failed:
-       mutex_destroy(&sbi->mutex);
        if (ubh)
                ubh_brelse_uspi (uspi);
        kfree (uspi);
@@ -1277,7 +1259,7 @@ static int ufs_remount (struct super_block *sb, int *mount_flags, char *data)
        unsigned flags;
 
        sync_filesystem(sb);
-       lock_ufs(sb);
+       mutex_lock(&UFS_SB(sb)->s_lock);
        uspi = UFS_SB(sb)->s_uspi;
        flags = UFS_SB(sb)->s_flags;
        usb1 = ubh_get_usb_first(uspi);
@@ -1291,20 +1273,20 @@ static int ufs_remount (struct super_block *sb, int *mount_flags, char *data)
        new_mount_opt = 0;
        ufs_set_opt (new_mount_opt, ONERROR_LOCK);
        if (!ufs_parse_options (data, &new_mount_opt)) {
-               unlock_ufs(sb);
+               mutex_unlock(&UFS_SB(sb)->s_lock);
                return -EINVAL;
        }
        if (!(new_mount_opt & UFS_MOUNT_UFSTYPE)) {
                new_mount_opt |= ufstype;
        } else if ((new_mount_opt & UFS_MOUNT_UFSTYPE) != ufstype) {
                pr_err("ufstype can't be changed during remount\n");
-               unlock_ufs(sb);
+               mutex_unlock(&UFS_SB(sb)->s_lock);
                return -EINVAL;
        }
 
        if ((*mount_flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) {
                UFS_SB(sb)->s_mount_opt = new_mount_opt;
-               unlock_ufs(sb);
+               mutex_unlock(&UFS_SB(sb)->s_lock);
                return 0;
        }
        
@@ -1327,7 +1309,7 @@ static int ufs_remount (struct super_block *sb, int *mount_flags, char *data)
         */
 #ifndef CONFIG_UFS_FS_WRITE
                pr_err("ufs was compiled with read-only support, can't be mounted as read-write\n");
-               unlock_ufs(sb);
+               mutex_unlock(&UFS_SB(sb)->s_lock);
                return -EINVAL;
 #else
                if (ufstype != UFS_MOUNT_UFSTYPE_SUN && 
@@ -1336,19 +1318,19 @@ static int ufs_remount (struct super_block *sb, int *mount_flags, char *data)
                    ufstype != UFS_MOUNT_UFSTYPE_SUNx86 &&
                    ufstype != UFS_MOUNT_UFSTYPE_UFS2) {
                        pr_err("this ufstype is read-only supported\n");
-                       unlock_ufs(sb);
+                       mutex_unlock(&UFS_SB(sb)->s_lock);
                        return -EINVAL;
                }
                if (!ufs_read_cylinder_structures(sb)) {
                        pr_err("failed during remounting\n");
-                       unlock_ufs(sb);
+                       mutex_unlock(&UFS_SB(sb)->s_lock);
                        return -EPERM;
                }
                sb->s_flags &= ~MS_RDONLY;
 #endif
        }
        UFS_SB(sb)->s_mount_opt = new_mount_opt;
-       unlock_ufs(sb);
+       mutex_unlock(&UFS_SB(sb)->s_lock);
        return 0;
 }
 
@@ -1380,8 +1362,7 @@ static int ufs_statfs(struct dentry *dentry, struct kstatfs *buf)
        struct ufs_super_block_third *usb3;
        u64 id = huge_encode_dev(sb->s_bdev->bd_dev);
 
-       lock_ufs(sb);
-
+       mutex_lock(&UFS_SB(sb)->s_lock);
        usb3 = ubh_get_usb_third(uspi);
        
        if ((flags & UFS_TYPE_MASK) == UFS_TYPE_UFS2) {
@@ -1402,7 +1383,7 @@ static int ufs_statfs(struct dentry *dentry, struct kstatfs *buf)
        buf->f_fsid.val[0] = (u32)id;
        buf->f_fsid.val[1] = (u32)(id >> 32);
 
-       unlock_ufs(sb);
+       mutex_unlock(&UFS_SB(sb)->s_lock);
 
        return 0;
 }
@@ -1418,6 +1399,8 @@ static struct inode *ufs_alloc_inode(struct super_block *sb)
                return NULL;
 
        ei->vfs_inode.i_version = 1;
+       seqlock_init(&ei->meta_lock);
+       mutex_init(&ei->truncate_mutex);
        return &ei->vfs_inode;
 }