From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E48823D3CEC for ; Mon, 6 Jul 2026 07:38:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783323508; cv=none; b=BxpxbWNa/xkq6JHNz8+zs2UUkxaTkHsDHnyCfuX3HarPiiS//Kv6ES+utXlYFrCzpSs8ir/TyukmMp1pOLiFGUAyh/4h3Va+D0d1tu6u55dxfNvvY3SgxzaV4JgIc+Lcx3BqqFAZaDNvkCI7xuxkHuEtw3XpHdXWR/gWCzADLsk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783323508; c=relaxed/simple; bh=yxN3n0uBBoB2PeQfjEmRc4+n8vulLTGWas8pBgZoFJg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AdwDQsfi3vcEOkT6fuW1mh/fwOMoPwHxq1SvsG/ohAS8xy2YgtKGihAN2pyGMzhZ/3TRwh8dn7O73b2jbecR4JqK3xyW3HdiE71Yi/X/0r/QLxIxACDD2odjNeyw10nea+Zj8tXw/HIRvqPWTlAvVMRb8s44HExYG9tZ4wmwV9E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=ionos.com; spf=pass smtp.mailfrom=ionos.com; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b=WR/29PNw; arc=none smtp.client-ip=209.85.221.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=ionos.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ionos.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b="WR/29PNw" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-4720f3bf164so1776069f8f.1 for ; Mon, 06 Jul 2026 00:38:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1783323498; x=1783928298; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Gh8gDU6QfX3j0JIY2KVF2WbaCqIvK2bLILJNkOnE3p4=; b=WR/29PNwMyRJOHI7yncWzFDYd1rXCBHuiQormxhegKGm63mMFr4m83/2cgtPIy8dwS iUKe85WPJey31Y1irBlpwkzUzgqWKe1/jqdDnrRbdzbRPL5dFcdpg5qyExufqWZg1MXL Aa0cY7BVoWyolBwoXwdOxZUdB5s9wCmSQaEA8lrj/MsuPorulxln5TnelkfbhgTtu3Xu /Qzj8TwJVXWAz+4CRUvCfrJ0enbUoCnNFd62CGIcvi7vRYdiquwDsE6wrELItYZMoFBT 1Zstc2Y3hMGM6klD1gvG8JVf+xKG1jQdML7UZt2cwb4Y2AeOhKq8gnRI5Bnq8yxOX+5n ctyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783323498; x=1783928298; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Gh8gDU6QfX3j0JIY2KVF2WbaCqIvK2bLILJNkOnE3p4=; b=B9NzO1NHnLd63xYhEJKEc5LHPN3eKMmO1XKF8yH1dFZeIiiyCBog0Y1WxgxG5ebr2x uw48HFuDJTC3I/KJE5Y8PZ6kTdaLgRZ12ETIN+N1r1cjgVnBKYfXamQur383DhgakLtq 8botV0gTWoTLxRnNpjU94TvLwiG0gBm6BDtLfv4TejDHubNeUHk+61HvzfwD8H9baiNj c33Okwz2is4h2JmqMUDA0rSemZ+dsE2jPZ+C/u/tFrzECL3TxMtU3KnYKmdVoruuuDJQ Vn1fmkBaSrVcBIc0fJLsWiWdJtMCV5j8d0eiMqOUqfOf1cH23AFBGYAyioHS4ejdFpm3 CB2A== X-Forwarded-Encrypted: i=1; AHgh+RrU/8kUDKRAcjW4A1m6qTVQF3Vm/NcGVcIdzGFEXMV7IloUPbz+8nGA1sGUpYhMcG3WmZR4UZ+hY/Vz+7k=@vger.kernel.org X-Gm-Message-State: AOJu0Yyq94bBCXVzU2YotcZyPfX0+AxqbcmYNdCxbH4T19VPHHmmIrf3 y8FNrhdWW8Z4YzeTrvOyGRnYig4NIy6b+qzEx2XOWMiOSm3QeCmbvBQt0Gx7z0rVVDk= X-Gm-Gg: AfdE7clO3z1y/AeVzgrqVuGgOzWmlECvRNnDuzT2sKcGTbEwPXDud7OD/GopBNCxFcL tPGgfOHrKUlR4cnwTTbBOJcRamse2PRct4CgYTQK5l+wDeROxq+4MBDcKzQZ6FCRp1IGzUBVEzE og5LahQVa5w7O/rRWnlV9SyrquA71I83kZxQf3CTZgv/qsBLln5wP68NcHXOKJh7JUpi/254A5w LXTrfX4zCwGv+pnWAjw+Ikr9Vcf2g9qCslsuscSZroZKp8NZH0mA5/O5gztbQByoDyISWdGZhSg WvrKvFACNsdsOq7dDlNyDiY5VICfZd0tbIF6GRB+iFOcjx+3kaTGxsIj8BdSGu+ly8htSQlf1/l IX3RC9I83zw9Rnsu6ZpP5Apss19FaETBhHaIBQwdDvfrGbyAV0ttj7u/PEvMv0UTfgxki80n35s URe2cbTygluV/1YBi9i3TVHNZFpNBoyTx69JcEtSM+cbUP1di2FiTkYYziFKpbC418TTC2WjTwH 5udpJHwume2bOp4 X-Received: by 2002:a5d:64c8:0:b0:45a:5392:3a19 with SMTP id ffacd0b85a97d-4793685fb5amr16402118f8f.16.1783323498066; Mon, 06 Jul 2026 00:38:18 -0700 (PDT) Received: from raven.intern.cm-ag (p200300dc6f45eb00023064fffe740809.dip0.t-ipconnect.de. [2003:dc:6f45:eb00:230:64ff:fe74:809]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47a9de1d8f1sm22248585f8f.3.2026.07.06.00.38.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jul 2026 00:38:17 -0700 (PDT) From: Max Kellermann To: idryomov@gmail.com, amarkuze@redhat.com, ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Max Kellermann Subject: [PATCH v2 2/4] fs/ceph: add helper function ceph_cap_is_removed() Date: Mon, 6 Jul 2026 09:38:10 +0200 Message-ID: <20260706073812.3922732-2-max.kellermann@ionos.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260706073812.3922732-1-max.kellermann@ionos.com> References: <20260706073812.3922732-1-max.kellermann@ionos.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Having it as a wrapper allows replacing the implementation, which the next patch will do. Signed-off-by: Max Kellermann --- fs/ceph/caps.c | 6 ++---- fs/ceph/mds_client.c | 2 +- fs/ceph/super.h | 14 ++++++++++++++ 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index c1213d72645e..f6f3e817b712 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -1128,8 +1128,7 @@ static void __ceph_remove_cap(struct ceph_cap *cap, bool queue_release) struct ceph_mds_client *mdsc; int removed = 0; - /* 'ci' being NULL means the remove have already occurred */ - if (!ci) { + if (ceph_cap_is_removed(cap)) { doutc(cl, "inode is NULL\n"); return; } @@ -1201,8 +1200,7 @@ void ceph_remove_cap(struct ceph_mds_client *mdsc, struct ceph_cap *cap, struct ceph_inode_info *ci = cap->ci; struct ceph_fs_client *fsc; - /* 'ci' being NULL means the remove have already occurred */ - if (!ci) { + if (ceph_cap_is_removed(cap)) { doutc(mdsc->fsc->client, "inode is NULL\n"); return; } diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 853bf698b356..019f5e60ff82 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -1902,7 +1902,7 @@ int ceph_iterate_session_caps(struct ceph_mds_session *session, spin_lock(&session->s_cap_lock); p = p->next; - if (!cap->ci) { + if (ceph_cap_is_removed(cap)) { doutc(cl, "finishing cap %p removal\n", cap); BUG_ON(cap->session != session); cap->session = NULL; diff --git a/fs/ceph/super.h b/fs/ceph/super.h index b878f14ca959..628d153601a5 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h @@ -1269,6 +1269,20 @@ extern void ceph_add_cap(struct inode *inode, unsigned issued, unsigned wanted, unsigned cap, unsigned seq, u64 realmino, int flags, struct ceph_cap **new_cap); + +/** + * Determine whether __ceph_remove_cap() has been called on this #cap + * (but the object has not yet been freed because it is protected by + * `ceph_mds_session.s_cap_iterator`). + * + * Caller must lock either `ceph_inode_info.i_ceph_lock` or + * `ceph_mds_session.s_cap_lock`. + */ +static inline bool ceph_cap_is_removed(const struct ceph_cap *cap) +{ + return !cap->ci; +} + extern void ceph_remove_cap(struct ceph_mds_client *mdsc, struct ceph_cap *cap, bool queue_release); extern void __ceph_remove_caps(struct ceph_inode_info *ci); -- 2.47.3