From a5bcc0bd15167cdf11ed4d00f78ded1598dccec8 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 16 Sep 2010 15:35:54 +0200 Subject: [PATCH] --- yaml --- r: 212961 b: refs/heads/master c: 3dbc4b32d0b39701cbec65582e196a20889155fb h: refs/heads/master i: 212959: 2bc7eb96aff363255ee14897ee6b644fe111378f v: v3 --- [refs] | 2 +- trunk/fs/squashfs/super.c | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 76ad3fc541f2..978689a5fc64 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a028dd2dd589c3924d9711a1b073a13c820b6b5 +refs/heads/master: 3dbc4b32d0b39701cbec65582e196a20889155fb diff --git a/trunk/fs/squashfs/super.c b/trunk/fs/squashfs/super.c index ab1a401a0e19..07a4f1156048 100644 --- a/trunk/fs/squashfs/super.c +++ b/trunk/fs/squashfs/super.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include @@ -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; int err; - lock_kernel(); - TRACE("Entered squashfs_fill_superblock\n"); sb->s_fs_info = kzalloc(sizeof(*msblk), GFP_KERNEL); if (sb->s_fs_info == NULL) { ERROR("Failed to allocate squashfs_sb_info\n"); - unlock_kernel(); return -ENOMEM; } 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"); kfree(sblk); - unlock_kernel(); return 0; failed_mount: @@ -319,13 +314,11 @@ static int squashfs_fill_super(struct super_block *sb, void *data, int silent) kfree(sb->s_fs_info); sb->s_fs_info = NULL; kfree(sblk); - unlock_kernel(); return err; failure: kfree(sb->s_fs_info); sb->s_fs_info = NULL; - unlock_kernel(); 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) { - lock_kernel(); - if (sb->s_fs_info) { struct squashfs_sb_info *sbi = sb->s_fs_info; squashfs_cache_delete(sbi->block_cache); @@ -376,8 +367,6 @@ static void squashfs_put_super(struct super_block *sb) kfree(sb->s_fs_info); sb->s_fs_info = NULL; } - - unlock_kernel(); }