Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754375AbZKBKHa (ORCPT ); Mon, 2 Nov 2009 05:07:30 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754508AbZKBKH3 (ORCPT ); Mon, 2 Nov 2009 05:07:29 -0500 Received: from cantor.suse.de ([195.135.220.2]:47274 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754383AbZKBKHA (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 , Chris Mason , Christoph Hellwig , Yan Zheng , Al Viro , Sage Weil , linux-btrfs@vger.kernel.org Subject: [PATCH 12/27] BKL: Remove BKL from btrfs Date: Mon, 2 Nov 2009 11:04:52 +0100 Message-Id: <1257156307-24175-13-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: 1373 Lines: 54 BKL is only used in get_sb. It is safe to remove it. Signed-off-by: Jan Blunck --- fs/btrfs/super.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index e5cd2cf..752a546 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -480,17 +480,13 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags, fmode_t mode = FMODE_READ; int error = 0; - lock_kernel(); - if (!(flags & MS_RDONLY)) mode |= FMODE_WRITE; error = btrfs_parse_early_options(data, mode, fs_type, &subvol_name, &fs_devices); - if (error) { - unlock_kernel(); + if (error) return error; - } error = btrfs_scan_one_device(dev_name, mode, fs_type, &fs_devices); if (error) @@ -559,7 +555,6 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags, mnt->mnt_root = root; kfree(subvol_name); - unlock_kernel(); return 0; error_s: @@ -568,7 +563,6 @@ error_close_devices: btrfs_close_devices(fs_devices); error_free_subvol_name: kfree(subvol_name); - unlock_kernel(); return error; } -- 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/