Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754848AbZKBKMo (ORCPT ); Mon, 2 Nov 2009 05:12:44 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754436AbZKBKMm (ORCPT ); Mon, 2 Nov 2009 05:12:42 -0500 Received: from cantor2.suse.de ([195.135.220.15]:58496 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754335AbZKBKHA (ORCPT ); Mon, 2 Nov 2009 05:07:00 -0500 From: Jan Blunck To: linux-fsdevel@vger.kernel.org Cc: Matthew Wilcox , linux-kernel@vger.kernel.org, Jan Blunck , Andrew Morton , Andreas Dilger , Jan Kara , Al Viro , "Theodore Ts'o" , linux-ext4@vger.kernel.org Subject: [PATCH 06/27] BKL: Remove BKL from ext3 fill_super() Date: Mon, 2 Nov 2009 11:04:46 +0100 Message-Id: <1257156307-24175-7-git-send-email-jblunck@suse.de> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <1257156307-24175-1-git-send-email-jblunck@suse.de> References: <1257156307-24175-1-git-send-email-jblunck@suse.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1773 Lines: 67 The BKL is protecting nothing than two memory allocations here. Signed-off-by: Jan Blunck --- fs/ext3/super.c | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) diff --git a/fs/ext3/super.c b/fs/ext3/super.c index 38261a5..4b635b7 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c @@ -1568,19 +1568,14 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent) __le32 features; int err; - lock_kernel(); - sbi = kzalloc(sizeof(*sbi), GFP_KERNEL); - if (!sbi) { - unlock_kernel(); + if (!sbi) return -ENOMEM; - } sbi->s_blockgroup_lock = kzalloc(sizeof(struct blockgroup_lock), GFP_KERNEL); if (!sbi->s_blockgroup_lock) { kfree(sbi); - unlock_kernel(); return -ENOMEM; } sb->s_fs_info = sbi; @@ -1589,8 +1584,6 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent) sbi->s_resgid = EXT3_DEF_RESGID; sbi->s_sb_block = sb_block; - unlock_kernel(); - blocksize = sb_min_blocksize(sb, EXT3_MIN_BLOCK_SIZE); if (!blocksize) { printk(KERN_ERR "EXT3-fs: unable to set blocksize\n"); @@ -1996,8 +1989,6 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent) test_opt(sb,DATA_FLAGS) == EXT3_MOUNT_ORDERED_DATA ? "ordered": "writeback"); - lock_kernel(); - unlock_kernel(); return 0; cantfind_ext3: @@ -2027,8 +2018,6 @@ out_fail: sb->s_fs_info = NULL; kfree(sbi->s_blockgroup_lock); kfree(sbi); - lock_kernel(); - unlock_kernel(); return ret; } -- 1.6.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/