From patchwork Fri May 18 07:49:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kent Overstreet X-Patchwork-Id: 10408429 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0A600601F9 for ; Fri, 18 May 2018 07:52:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F1F2D2886A for ; Fri, 18 May 2018 07:52:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E6B9928875; Fri, 18 May 2018 07:52:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 949692886A for ; Fri, 18 May 2018 07:52:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752391AbeERHuR (ORCPT ); Fri, 18 May 2018 03:50:17 -0400 Received: from mail-qk0-f194.google.com ([209.85.220.194]:45648 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752366AbeERHuN (ORCPT ); Fri, 18 May 2018 03:50:13 -0400 Received: by mail-qk0-f194.google.com with SMTP id a8-v6so5728016qkj.12; Fri, 18 May 2018 00:50:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jmc7AEzlKlmmRlnCWPCGp07c3kvuJcXfX3r2Ikw0m7A=; b=kpfRRziAJjobH8qu0mtOwIugXwxqwZUnwDi7y465ElC3Me7ggYyhXb/L8BfRnVnTKU RRfGSsp6/zj/HtSZjRR18An5pEXeLfYbhAjRvPSin79oCfXSyh/bfUsBKAUeP0TBVQ54 saB3K6ARkGMBxSsBcuWv3GklM+evfD6iBnnAcqgLTovOQ6IlYqDh+5jjbcGV9ikRCcTD /1mPIjeZEfcUUcclf6/D4stncU1DgN2CAWyG+Z806hEl1wVW0drJB7KThJRD2JJYqrYw rdtUiguVZKxZ09uTkFW0MvI8qayhMJp6mjy94uHfuIXpv8p+rVQfQrK472KDJ8NIT725 +WTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jmc7AEzlKlmmRlnCWPCGp07c3kvuJcXfX3r2Ikw0m7A=; b=SeD8huSnhv3vnaAeJ9U85voczrbRxw6m2z2HqavfDKDjChl9JGRg626/8OcXVmUKMR xARu4ELQiwU2I3/93gdhJvZ0uVUeH9HmHcdoTvitEN3YNvrjYBRMWKLZmCl+ea7O911e QbgIkuOn8pFklJy6G4QhobRcbQ2lZbm7AclaFyob6SyFKHUxfkZ+gtSAhYbi96GTBMzS 0QTox3I7/uDOYRpSRxgDeLTlLC3gnhmN6bqI/NQwIyKfmQhAKQ6EgxO1jGJuPR3aeU6w GsgWhb+Fr+b1hawRCiNz0mcpBWWJMnT6o+lludq9OgoKoHF7b4s/hOMFNU5jgHLqdVR6 IZFg== X-Gm-Message-State: ALKqPwfPULhjXb2GZvXyD3MGEdKdccF7LM8qYdM6cUXDw1m8TSM/pJZ0 txIa7f6c5YPnYejWfVKBOWpXLMtnBA== X-Google-Smtp-Source: AB8JxZq9dqvbBDLomlU366NHViMs3S+rQvtHhi5CStY02e08nJm9T3y6msyrRZwzf+j5Cm3rDeUdmw== X-Received: by 2002:a37:488:: with SMTP id 130-v6mr7526951qke.125.1526629812511; Fri, 18 May 2018 00:50:12 -0700 (PDT) Received: from localhost.localdomain (c-71-234-172-214.hsd1.vt.comcast.net. [71.234.172.214]) by smtp.gmail.com with ESMTPSA id s64-v6sm5443004qkl.85.2018.05.18.00.50.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 May 2018 00:50:11 -0700 (PDT) From: Kent Overstreet To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Cc: Kent Overstreet , Andrew Morton , Dave Chinner , darrick.wong@oracle.com, tytso@mit.edu, linux-btrfs@vger.kernel.org, clm@fb.com, jbacik@fb.com, viro@zeniv.linux.org.uk, willy@infradead.org, peterz@infradead.org Subject: [PATCH 07/10] bcache: optimize continue_at_nobarrier() Date: Fri, 18 May 2018 03:49:11 -0400 Message-Id: <20180518074918.13816-14-kent.overstreet@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180518074918.13816-1-kent.overstreet@gmail.com> References: <20180518074918.13816-1-kent.overstreet@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Kent Overstreet --- drivers/md/bcache/closure.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h index 3b9dfc9962..2392a46bcd 100644 --- a/drivers/md/bcache/closure.h +++ b/drivers/md/bcache/closure.h @@ -244,7 +244,7 @@ static inline void closure_queue(struct closure *cl) != offsetof(struct work_struct, func)); if (wq) { INIT_WORK(&cl->work, cl->work.func); - BUG_ON(!queue_work(wq, &cl->work)); + queue_work(wq, &cl->work); } else cl->fn(cl); } @@ -337,8 +337,13 @@ do { \ */ #define continue_at_nobarrier(_cl, _fn, _wq) \ do { \ - set_closure_fn(_cl, _fn, _wq); \ - closure_queue(_cl); \ + closure_set_ip(_cl); \ + if (_wq) { \ + INIT_WORK(&(_cl)->work, (void *) _fn); \ + queue_work((_wq), &(_cl)->work); \ + } else { \ + (_fn)(_cl); \ + } \ } while (0) /**