Received: by 2002:a25:e7d8:0:0:0:0:0 with SMTP id e207csp3132941ybh; Mon, 16 Mar 2020 16:39:43 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuj8NtCEqRhxDwkX16MoGMbxBd/lbEVDzrWU2fERaXtS4SDvcTMfZ9t8DpUJd5aUhZ2v3Jv X-Received: by 2002:a9d:5e8a:: with SMTP id f10mr1499774otl.143.1584401983144; Mon, 16 Mar 2020 16:39:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584401983; cv=none; d=google.com; s=arc-20160816; b=heq8iEqkDZ2n5Ycit6vwFeC4QEXzNrQgM6h7vb5m7vKDsr1wsCE4KpJNP6oUARqjC8 mQskYlfBSGui7WVQ5Me46iJf6vIs/cHbbQSYk62LiG5AdG91050h0tyHB3PPclc513Ci l5kvQDWz3dqS10BhRIIfZR9SU7lLI5xEjE7YiRKC0NqIr+ytwRMdqqqBOJjd/6uL5VCS XLrVi7BYvv13UjOhj/7RFi/CU+30tKrlTXGFIXP+SDV0DptEQ8+lppGQrUbyAlSFxr15 /iKLXz9MjWUbneYN5PCesx/f5WzoafYgRYejFQikRjVEIu1N3GyAp3mwumuRj7MJE/J0 mUDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=n6sFKO+k+B7M8HISJMJ4F/MsvQHfG/I2iTodahtZLUY=; b=TE2ow16MuG3bKqThAweXkEHcllpPxPPVKx9cFS22PK1yx3Ez7LbYa3thTiyO8RZc0M B/oytG6dC1kD9pEgGvRhUv4QOqxkLx5TS1RttOFA/p/lzwcBilj08lX0T0InbpE0XAJA bnbKfuF9JMfw7puitbRGJeXdo7LpvDo+AF/NKdt8sLQ9YkNm0kNQwmyEFzXMvQeJDrbc JRxBojFze7G9g9MWkx3qfbQjgTakvAdVYDg8EEjDuk046dXSpCs85YFCmHSq/LfLftoS q/C32T12IhFfGpzyabaFu4f0vpu5JHHPsA27GKVXd4lLXmuMeDpmjiKhERMNJdAn4w60 vK1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=QuhxdzvE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d26si673120ote.210.2020.03.16.16.39.24; Mon, 16 Mar 2020 16:39:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=QuhxdzvE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732993AbgCPXi5 (ORCPT + 99 others); Mon, 16 Mar 2020 19:38:57 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:33369 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732965AbgCPXi4 (ORCPT ); Mon, 16 Mar 2020 19:38:56 -0400 Received: by mail-wm1-f65.google.com with SMTP id r7so14410207wmg.0; Mon, 16 Mar 2020 16:38:54 -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 :mime-version:content-transfer-encoding; bh=n6sFKO+k+B7M8HISJMJ4F/MsvQHfG/I2iTodahtZLUY=; b=QuhxdzvE/B9WfM8MrDcHJvGg/S1obd/Whx3bLHc9bvKRJbBcXuZgxRohoXyZ30MaVJ 4tQdfotLI7/67XUbDUCGHOVPnrCCI9iUaOzOKNhk4QWi+382kLdLwVHCxrG2TAte9F22 64Fg+8J9S/ZKZj9JhxINfvSEYv55H0mKTJf8aOVWLQAtuKMEWSvbVQVl8Y6uRw/JLJxW JiDbAqjxlisach4k44Q268RccUuV0e5mXp+VJg/l4irhOYnAR8RLk+QkMg+koe/k1k6Y 46VVcvAoAqOkAxBjGOA8KmzU95zgpGSd5Q+0rcXzk3ogyKHnzxlAaFyfWAuZBsYio/Xi uXyQ== 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:mime-version:content-transfer-encoding; bh=n6sFKO+k+B7M8HISJMJ4F/MsvQHfG/I2iTodahtZLUY=; b=M7Uc7BcHNKMEB7ce7VwVP8mI4bZYOopD06eam+m6jQO6HRsROo9Roap/VzYp+eRGc8 Ex4Ah31ZDD0eh3ct9ZbCQH0UJXX2+XCQIPfx0auY3Tzc/1nV6a/ksO3eL1VanQGVWAfp xsQo9V9dgrLVo5Unpw33ccYliF91wxzePfgLpIZ5j41Hk/j/ACl6BXg8k8jREmVSh4zC GotxpIxVkqP1r7IJZbMAi/9Qhx2MeuIMs5CyBNlAhj6jjIasDSRqL32u7e9rnrrqgaml q6LtI1g+l7kK34ToDfM8BshEcTetQMR/noCvUa3G3lJYd/jIfQPEcKEazuo3+5KZY/WF 9lTw== X-Gm-Message-State: ANhLgQ3zaM28bkO6bsKfAl/9r5mvrePkSIOsYwmeEhLldzgIyycrygbv z1PFpHYTK8P6yts+79VJLA== X-Received: by 2002:a1c:a102:: with SMTP id k2mr1374680wme.125.1584401933955; Mon, 16 Mar 2020 16:38:53 -0700 (PDT) Received: from localhost.localdomain (host-92-23-82-35.as13285.net. [92.23.82.35]) by smtp.googlemail.com with ESMTPSA id i9sm1510495wmd.37.2020.03.16.16.38.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 16:38:53 -0700 (PDT) From: Jules Irenge To: boqun.feng@gmail.com Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Alexander Viro Subject: [PATCH 5/6] fs/fs-writeback.c: replace two annotations for __inode_wait_for_writeback() Date: Mon, 16 Mar 2020 23:38:03 +0000 Message-Id: <20200316233804.96657-6-jbi.octave@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200316233804.96657-1-jbi.octave@gmail.com> References: <0/6> <20200316233804.96657-1-jbi.octave@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To improve readability of the code, __releases(inode->i_lock) and __acquires(inode->i_lock) annotations here are replaced by one annotation __must_hold(inode->i_lock) Signed-off-by: Jules Irenge --- fs/fs-writeback.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index 008e572faf32..d0c0dc10526d 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c @@ -1322,8 +1322,7 @@ static int write_inode(struct inode *inode, struct writeback_control *wbc) * Caller must make sure inode cannot go away when we drop i_lock. */ static void __inode_wait_for_writeback(struct inode *inode) - __releases(inode->i_lock) - __acquires(inode->i_lock) + __must_hold(inode->i_lock) { DEFINE_WAIT_BIT(wq, &inode->i_state, __I_SYNC); wait_queue_head_t *wqh; -- 2.24.1