luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BKL: Remove BKL from squashfs

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

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Phillip Lougher <phillip@lougher.demon.co.uk>
This commit is contained in:
Arnd Bergmann 2010-09-16 15:35:54 +02:00
parent 1a028dd2dd
commit 3dbc4b32d0
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/squashfs/super.c
View File

@ -30,7 +30,6 @@
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/vfs.h> #include <linux/vfs.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/smp_lock.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/pagemap.h> #include <linux/pagemap.h>
#include <linux/init.h> #include <linux/init.h>
@ -87,14 +86,11 @@ static int squashfs_fill_super(struct super_block *sb, void *data, int silent)
u64 lookup_table_start, xattr_id_table_start; u64 lookup_table_start, xattr_id_table_start;
int err; int err;
lock_kernel();
TRACE("Entered squashfs_fill_superblock\n"); TRACE("Entered squashfs_fill_superblock\n");
sb->s_fs_info = kzalloc(sizeof(*msblk), GFP_KERNEL); sb->s_fs_info = kzalloc(sizeof(*msblk), GFP_KERNEL);
if (sb->s_fs_info == NULL) { if (sb->s_fs_info == NULL) {
ERROR("Failed to allocate squashfs_sb_info\n"); ERROR("Failed to allocate squashfs_sb_info\n");
unlock_kernel();
return -ENOMEM; return -ENOMEM;
} }
msblk = sb->s_fs_info; msblk = sb->s_fs_info;
@ -304,7 +300,6 @@ static int squashfs_fill_super(struct super_block *sb, void *data, int silent)
TRACE("Leaving squashfs_fill_super\n"); TRACE("Leaving squashfs_fill_super\n");
kfree(sblk); kfree(sblk);
unlock_kernel();
return 0; return 0;
failed_mount: failed_mount:
@ -319,13 +314,11 @@ static int squashfs_fill_super(struct super_block *sb, void *data, int silent)
kfree(sb->s_fs_info); kfree(sb->s_fs_info);
sb->s_fs_info = NULL; sb->s_fs_info = NULL;
kfree(sblk); kfree(sblk);
unlock_kernel();
return err; return err;
failure: failure:
kfree(sb->s_fs_info); kfree(sb->s_fs_info);
sb->s_fs_info = NULL; sb->s_fs_info = NULL;
unlock_kernel();
return -ENOMEM; return -ENOMEM;
} }
@ -360,8 +353,6 @@ static int squashfs_remount(struct super_block *sb, int *flags, char *data)
static void squashfs_put_super(struct super_block *sb) static void squashfs_put_super(struct super_block *sb)
{ {
lock_kernel();
if (sb->s_fs_info) { if (sb->s_fs_info) {
struct squashfs_sb_info *sbi = sb->s_fs_info; struct squashfs_sb_info *sbi = sb->s_fs_info;
squashfs_cache_delete(sbi->block_cache); squashfs_cache_delete(sbi->block_cache);
@ -376,8 +367,6 @@ static void squashfs_put_super(struct super_block *sb)
kfree(sb->s_fs_info); kfree(sb->s_fs_info);
sb->s_fs_info = NULL; sb->s_fs_info = NULL;
} }
unlock_kernel();
} }