iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BKL: Remove BKL from Amiga FFS

Browse Source 
The BKL is only used in put_super, fill_super and remount_fs that are all
three protected by the superblocks s_umount rw_semaphore. Therefore it is
safe to remove the BKL entirely.

Signed-off-by: Jan Blunck <jblunck@infradead.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Jan Blunck 2010-08-15 22:52:36 +02:00 committed by Arnd Bergmann
parent db71922217
commit 74c41429ae
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fs/affs/super.c
View File

@ -16,7 +16,6 @@
#include <linux/parser.h> #include <linux/parser.h>
#include <linux/magic.h> #include <linux/magic.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/smp_lock.h>
#include <linux/slab.h> #include <linux/slab.h>
#include "affs.h" #include "affs.h"
@ -46,8 +45,6 @@ affs_put_super(struct super_block *sb)
struct affs_sb_info *sbi = AFFS_SB(sb); struct affs_sb_info *sbi = AFFS_SB(sb);
pr_debug("AFFS: put_super()\n"); pr_debug("AFFS: put_super()\n");
lock_kernel();
if (!(sb->s_flags & MS_RDONLY) && sb->s_dirt) if (!(sb->s_flags & MS_RDONLY) && sb->s_dirt)
affs_commit_super(sb, 1, 1); affs_commit_super(sb, 1, 1);
@ -56,8 +53,6 @@ affs_put_super(struct super_block *sb)
affs_brelse(sbi->s_root_bh); affs_brelse(sbi->s_root_bh);
kfree(sbi); kfree(sbi);
sb->s_fs_info = NULL; sb->s_fs_info = NULL;
unlock_kernel();
} }
static void static void
@ -291,8 +286,6 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent)
u8 sig[4]; u8 sig[4];
int ret = -EINVAL; int ret = -EINVAL;
lock_kernel();
save_mount_options(sb, data); save_mount_options(sb, data);
pr_debug("AFFS: read_super(%s)\n",data ? (const char *)data : "no options"); pr_debug("AFFS: read_super(%s)\n",data ? (const char *)data : "no options");
@ -302,10 +295,9 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent)
sb->s_flags |= MS_NODIRATIME; sb->s_flags |= MS_NODIRATIME;
sbi = kzalloc(sizeof(struct affs_sb_info), GFP_KERNEL); sbi = kzalloc(sizeof(struct affs_sb_info), GFP_KERNEL);
if (!sbi) { if (!sbi)
unlock_kernel();
return -ENOMEM; return -ENOMEM;
}
sb->s_fs_info = sbi; sb->s_fs_info = sbi;
mutex_init(&sbi->s_bmlock); mutex_init(&sbi->s_bmlock);
spin_lock_init(&sbi->symlink_lock); spin_lock_init(&sbi->symlink_lock);
@ -316,7 +308,6 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent)
printk(KERN_ERR "AFFS: Error parsing options\n"); printk(KERN_ERR "AFFS: Error parsing options\n");
kfree(sbi->s_prefix); kfree(sbi->s_prefix);
kfree(sbi); kfree(sbi);
unlock_kernel();
return -EINVAL; return -EINVAL;
} }
/* N.B. after this point s_prefix must be released */ /* N.B. after this point s_prefix must be released */
@ -487,7 +478,6 @@ got_root:
sb->s_root->d_op = &affs_dentry_operations; sb->s_root->d_op = &affs_dentry_operations;
pr_debug("AFFS: s_flags=%lX\n",sb->s_flags); pr_debug("AFFS: s_flags=%lX\n",sb->s_flags);
unlock_kernel();
return 0; return 0;
/* /*
@ -502,7 +492,6 @@ out_error_noinode:
kfree(sbi->s_prefix); kfree(sbi->s_prefix);
kfree(sbi); kfree(sbi);
sb->s_fs_info = NULL; sb->s_fs_info = NULL;
unlock_kernel();
return ret; return ret;
} }
@ -534,7 +523,7 @@ affs_remount(struct super_block *sb, int *flags, char *data)
kfree(new_opts); kfree(new_opts);
return -EINVAL; return -EINVAL;
} }
lock_kernel();
replace_mount_options(sb, new_opts); replace_mount_options(sb, new_opts);
sbi->s_flags = mount_flags; sbi->s_flags = mount_flags;
@ -550,17 +539,15 @@ affs_remount(struct super_block *sb, int *flags, char *data)
memcpy(sbi->s_volume, volume, 32); memcpy(sbi->s_volume, volume, 32);
spin_unlock(&sbi->symlink_lock); spin_unlock(&sbi->symlink_lock);
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) { if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
unlock_kernel();
return 0; return 0;
}
if (*flags & MS_RDONLY) { if (*flags & MS_RDONLY) {
affs_write_super(sb); affs_write_super(sb);
affs_free_bitmap(sb); affs_free_bitmap(sb);
} else } else
res = affs_init_bitmap(sb, flags); res = affs_init_bitmap(sb, flags);
unlock_kernel();
return res; return res;
} }