From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE48AC43387 for ; Tue, 15 Jan 2019 10:19:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 93C1B20656 for ; Tue, 15 Jan 2019 10:19:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727703AbfAOKT2 (ORCPT ); Tue, 15 Jan 2019 05:19:28 -0500 Received: from relay.sw.ru ([185.231.240.75]:36290 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726077AbfAOKT1 (ORCPT ); Tue, 15 Jan 2019 05:19:27 -0500 Received: from [172.16.25.169] (helo=localhost.localdomain) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1gjLob-00012c-My; Tue, 15 Jan 2019 13:19:25 +0300 Subject: [PATCH 2/7] fuse: Move flush_bg_queue() up in fuse_abort_conn() From: Kirill Tkhai To: miklos@szeredi.hu, ktkhai@virtuozzo.com, linux-fsdevel@vger.kernel.org Date: Tue, 15 Jan 2019 13:19:25 +0300 Message-ID: <154754756520.4244.2632848231069869374.stgit@localhost.localdomain> In-Reply-To: <154754701031.4244.8089449938935364463.stgit@localhost.localdomain> References: <154754701031.4244.8089449938935364463.stgit@localhost.localdomain> User-Agent: StGit/0.18 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Preparation for next patches. Signed-off-by: Kirill Tkhai --- fs/fuse/dev.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index 8a63e52785e9..dd8f019447a9 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -2191,6 +2191,9 @@ void fuse_abort_conn(struct fuse_conn *fc) /* Background queuing checks fc->connected under bg_lock */ spin_lock(&fc->bg_lock); fc->connected = 0; + fc->blocked = 0; + fc->max_background = UINT_MAX; + flush_bg_queue(fc); spin_unlock(&fc->bg_lock); fuse_set_initialized(fc); @@ -2215,11 +2218,6 @@ void fuse_abort_conn(struct fuse_conn *fc) &to_end); spin_unlock(&fpq->lock); } - spin_lock(&fc->bg_lock); - fc->blocked = 0; - fc->max_background = UINT_MAX; - flush_bg_queue(fc); - spin_unlock(&fc->bg_lock); spin_lock(&fiq->waitq.lock); fiq->connected = 0;