From patchwork Sat Aug 9 11:51:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Utkin X-Patchwork-Id: 4702831 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 91072C0338 for ; Sat, 9 Aug 2014 11:51:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A1C392015E for ; Sat, 9 Aug 2014 11:51:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C892A2013D for ; Sat, 9 Aug 2014 11:51:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751374AbaHILv1 (ORCPT ); Sat, 9 Aug 2014 07:51:27 -0400 Received: from mail-lb0-f177.google.com ([209.85.217.177]:41276 "EHLO mail-lb0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750969AbaHILv0 (ORCPT ); Sat, 9 Aug 2014 07:51:26 -0400 Received: by mail-lb0-f177.google.com with SMTP id s7so4624842lbd.36 for ; Sat, 09 Aug 2014 04:51:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=pDRmjxgV1gXmaNbQQtkom3yeyczkc/ROngTMkNo0ONU=; b=JBfqdhwSaH+tCLsJiJgwOpdaL74uygFGZ4RjKGEwl+IDpR5qSw5M6Wcf4z93ArNzro hHlyY2FxuBvn9swsHJS9rbASjmfzHwC4xBk4rjfZBeUgSKyCrKpBDtSdgOOTDM8To7Ds KUr3LB6sWGwj6rcScwPslUM12SPf4iAA07iLjAChn6EXL/jzEtqJAwusC+TUX+iYW+kG tXDMsfCWhWxxChriMMjoWKdLyd/t/BNuphkmoGTE7PA+cmyna54AfW4oByUONe4U4BTO naliX/u/VjfOjwS/ezVkV6IYxyK8Hyil66imK7bTQsRkLBW2RGWxJB3s8vRwTUAHVT2N eubg== X-Received: by 10.112.128.233 with SMTP id nr9mr9270227lbb.43.1407585084489; Sat, 09 Aug 2014 04:51:24 -0700 (PDT) Received: from localhost.localdomain (alfa-g11.tenet.odessa.ua. [195.138.73.151]) by mx.google.com with ESMTPSA id er11sm8756982lbc.49.2014.08.09.04.51.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 09 Aug 2014 04:51:23 -0700 (PDT) From: Andrey Utkin To: clm@fb.com, jbacik@fb.com Cc: linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Andrey Utkin Subject: [PATCH] btrfs: Drop stray check of fixup_workers creation Date: Sat, 9 Aug 2014 14:51:15 +0300 Message-Id: <1407585075-31035-1-git-send-email-andrey.krieger.utkin@gmail.com> X-Mailer: git-send-email 1.8.5.5 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The issue was introduced in a79b7d4b3e8118f265dcb4bdf9a572c392f02708, adding allocation of extent_workers, so this stray check is surely not meant to be a check of something else. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=82021 Reported-by: Maks Naumov Signed-off-by: Andrey Utkin Reviewed-by: Eric Sandeen --- fs/btrfs/disk-io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 08e65e9..1881713 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -2601,7 +2601,7 @@ int open_ctree(struct super_block *sb, fs_info->endio_freespace_worker && fs_info->rmw_workers && fs_info->caching_workers && fs_info->readahead_workers && fs_info->fixup_workers && fs_info->delayed_workers && - fs_info->fixup_workers && fs_info->extent_workers && + fs_info->extent_workers && fs_info->qgroup_rescan_workers)) { err = -ENOMEM; goto fail_sb_buffer;