From patchwork Wed Jan 6 17:41:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Foster X-Patchwork-Id: 12002011 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=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,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 B14EFC4332D for ; Wed, 6 Jan 2021 17:43:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 78AC82312A for ; Wed, 6 Jan 2021 17:43:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727205AbhAFRnA (ORCPT ); Wed, 6 Jan 2021 12:43:00 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:44192 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727022AbhAFRm7 (ORCPT ); Wed, 6 Jan 2021 12:42:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1609954894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Gjx49N/ITT+YnACE2GV9FfidUeKrEsXOtUOJfj371tE=; b=RxsMZmn7lRyTuBCXn/xgMPDUf5VJIiPkRwUFUG0ROzpLBnAbLMtSR/fqfvYeAlrJjKFbta BI+t3KRC/9fxUVqRswV6XVVnFdX+j2M4X6nClwkdUzMbcEFf1Ua5htXhe50Zm9BbnmXWEO 9CI0G7dvh1wlLqz5Pn4o0TIvpiEuQ60= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-529-5AgY-PYUNWC7n7EQzECrxw-1; Wed, 06 Jan 2021 12:41:32 -0500 X-MC-Unique: 5AgY-PYUNWC7n7EQzECrxw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 418EF1005504 for ; Wed, 6 Jan 2021 17:41:31 +0000 (UTC) Received: from bfoster.redhat.com (ovpn-114-23.rdu2.redhat.com [10.10.114.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 03AC319635 for ; Wed, 6 Jan 2021 17:41:30 +0000 (UTC) From: Brian Foster To: linux-xfs@vger.kernel.org Subject: [PATCH 7/9] xfs: remove duplicate wq cancel and log force from attr quiesce Date: Wed, 6 Jan 2021 12:41:25 -0500 Message-Id: <20210106174127.805660-8-bfoster@redhat.com> In-Reply-To: <20210106174127.805660-1-bfoster@redhat.com> References: <20210106174127.805660-1-bfoster@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org These two calls are repeated at the beginning of xfs_log_quiesce(). Drop them from xfs_quiesce_attr(). Signed-off-by: Brian Foster Reviewed-by: Darrick J. Wong --- fs/xfs/xfs_super.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index 75ada867c665..8fc9044131fc 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -884,11 +884,6 @@ void xfs_quiesce_attr( struct xfs_mount *mp) { - cancel_delayed_work_sync(&mp->m_log->l_work); - - /* force the log to unpin objects from the now complete transactions */ - xfs_log_force(mp, XFS_LOG_SYNC); - xfs_log_clean(mp); }