From patchwork Mon Oct 12 15:16:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 269493 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=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 A258BC433DF for ; Mon, 12 Oct 2020 15:16:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 62C8A20878 for ; Mon, 12 Oct 2020 15:16:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602515810; bh=VRzsmcSA4KOknbE3WYJYcw0zHkJCJjzdMLaQmQv+AUA=; h=From:To:Subject:Date:List-ID:From; b=pz5kNd7YEMp3uYK/6mPR/3TAksDggnljqXMLQ0myrcpzcdtBM2xJ7oY4gAANu1lti 92KJhW3It/rggKD/AoMyc8VQlBbJyTEatoLJG/dNVnarDoJwvSKx6dFIj4XnigJZGs mR3hEDNTCzrW1L/Cih1pAVoh+V59DG8FpNgScOUA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389778AbgJLPQt (ORCPT ); Mon, 12 Oct 2020 11:16:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:34402 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389580AbgJLPQt (ORCPT ); Mon, 12 Oct 2020 11:16:49 -0400 Received: from tleilax.com (68-20-15-154.lightspeed.rlghnc.sbcglobal.net [68.20.15.154]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0065520878 for ; Mon, 12 Oct 2020 15:16:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602515808; bh=VRzsmcSA4KOknbE3WYJYcw0zHkJCJjzdMLaQmQv+AUA=; h=From:To:Subject:Date:From; b=z44TAG8ufZeVL4XanPWFLkqnv7UoINOkCYq5tdeyOzsbUYx6TpxZKGHneHwLScuBU EtBQ8+yb2R77kl/FBosErKemZFSarJE5kwgzMdflGZDHrVkG41mpQSkGkVip+QhPV/ ADwZD3uhwi6dFE0C9ikt73+D/sqbf+jw/AZ5Lxx8= From: Jeff Layton To: ceph-devel@vger.kernel.org Subject: [PATCH] ceph: add a queue_inode_work helper Date: Mon, 12 Oct 2020 11:16:46 -0400 Message-Id: <20201012151646.310836-1-jlayton@kernel.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Currently, this is open-coded everywhere. Add a wrapper around queue_work that takes an inode pointer. Signed-off-by: Jeff Layton --- fs/ceph/inode.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index 02b11a4a4d39..7c22bc2ea076 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -1801,6 +1801,13 @@ bool ceph_inode_set_size(struct inode *inode, loff_t size) return ret; } +static bool queue_inode_work(struct inode *inode) +{ + struct ceph_fs_client *fsc = ceph_inode_to_client(inode); + + return queue_work(fsc->inode_wq, &ceph_inode(inode)->i_work); +} + /* * Put reference to inode, but avoid calling iput_final() in current thread. * iput_final() may wait for reahahead pages. The wait can cause deadlock in @@ -1813,8 +1820,7 @@ void ceph_async_iput(struct inode *inode) for (;;) { if (atomic_add_unless(&inode->i_count, -1, 1)) break; - if (queue_work(ceph_inode_to_client(inode)->inode_wq, - &ceph_inode(inode)->i_work)) + if (queue_inode_work(inode)) break; /* queue work failed, i_count must be at least 2 */ } @@ -1830,8 +1836,7 @@ void ceph_queue_writeback(struct inode *inode) set_bit(CEPH_I_WORK_WRITEBACK, &ci->i_work_mask); ihold(inode); - if (queue_work(ceph_inode_to_client(inode)->inode_wq, - &ci->i_work)) { + if (queue_inode_work(inode)) { dout("ceph_queue_writeback %p\n", inode); } else { dout("ceph_queue_writeback %p already queued, mask=%lx\n", @@ -1849,8 +1854,7 @@ void ceph_queue_invalidate(struct inode *inode) set_bit(CEPH_I_WORK_INVALIDATE_PAGES, &ci->i_work_mask); ihold(inode); - if (queue_work(ceph_inode_to_client(inode)->inode_wq, - &ceph_inode(inode)->i_work)) { + if (queue_inode_work(inode)) { dout("ceph_queue_invalidate %p\n", inode); } else { dout("ceph_queue_invalidate %p already queued, mask=%lx\n", @@ -1869,8 +1873,7 @@ void ceph_queue_vmtruncate(struct inode *inode) set_bit(CEPH_I_WORK_VMTRUNCATE, &ci->i_work_mask); ihold(inode); - if (queue_work(ceph_inode_to_client(inode)->inode_wq, - &ci->i_work)) { + if (queue_inode_work(inode)) { dout("ceph_queue_vmtruncate %p\n", inode); } else { dout("ceph_queue_vmtruncate %p already queued, mask=%lx\n",