From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) (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 16578253355 for ; Wed, 27 Aug 2025 19:24:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756322689; cv=none; b=IyfB1qdJ8XlSeZTzvzkkT94UCGbHV8wB77j9c995U/tCtfVUDjIflzVEDvvAKfPoBKzU1ydq1vSXPvLd9tvYhlWqoTNPhrYtaRCLBHVeHtFGGAs1w0FiLVwdBFK49fk5YKEPB61JmsajmYCTBeKFb7LviRaPVeZtanxZ4zY66XQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756322689; c=relaxed/simple; bh=nDyDk7Appk/phu2FkCYalV/0D0HJgDI2+clJwnrK4kk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=T70/C2j+ncrAqo2Ce/jTS1TvBaygV16uGjFzXGl1aRgiuYagfidO5eSRZ7aYD6j1NR0bMBB/8qMHkmcWVF64wlMIh4NLnC6+zCenFYUuFyKsPiefwEYCF7cj6Urk9XgmGYzr/KlfchDi/yj40niOGhPrzo7wrHTG2kGF7+0LLbQ= 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=VLKqlCiF; arc=none smtp.client-ip=209.85.208.50 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="VLKqlCiF" Received: by mail-ed1-f50.google.com with SMTP id 4fb4d7f45d1cf-61a8c134533so307092a12.3 for ; Wed, 27 Aug 2025 12:24:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1756322685; x=1756927485; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=g+X4Fejj0KpirEOqCpH1ofp+/ux4qvnE2+QS5K8M9VE=; b=VLKqlCiFMHL8M1kAfm3w/eus5aBlarSxVJZLQMHcBs7CaFohtK3dbV9wSlULE+IJIM 0WgfsqjKputK3K4PX0l2BlqSgpmB7EzO6ncYDHdy0DimRU+urMaV3Ig2dL2S0VykOmoe eCi1YXdhscbGOP+CuFw3gC8qxLFGSX0FGaVRbz76tbeb7ehT+uPc67uOLeb8rkG6r5u6 ZIQieVfhPQ0ishxYnoTV8FXpoyYt0I+0tHnO0wKCSjrUYFiYu1NQa0w3v5fhd1tJ5+J6 T+pQctZ3U7oMICknS6HgQl16yapiHE7euXviaOwDUQLqUOHI14/92/K1DwitSk+eVicr LggA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756322685; x=1756927485; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=g+X4Fejj0KpirEOqCpH1ofp+/ux4qvnE2+QS5K8M9VE=; b=KEsaZzCSKgLjjWhw4J1UBb0VEXJ96+SMr8/RSiD5auW6doB4fx6NLZPkPWrYVBDEe/ uI11sr7JMNWqDRPw8fswDUTf5+MPDMON0qOQAoaFSo0r4YWT2jW9Pm9v0vIAPsuc82Vy CqGSrrl7rK4WDyptnb0+cfbexga6fQZT4sEmqCcyFBYrY3QxHVEMHrfAcT0CSx2xJ9UJ w4W4XP2xIlBkRV7HAxeGv/+MI8jAHfy0GFsL5+erf07luxaO3RQKOOWTeyWxCd7JtihB g+7locnz9we7IKx5RQ/hoJYDV8qKfR276vniAIBPzvFdxDO+xMdWFJ0Eg7+HgFqc7gQH bpfw== X-Forwarded-Encrypted: i=1; AJvYcCXHd4kwPt4uLkh2wpRua/fM2sul6qwXjA/M9eiNuF9PBZeBgNRctIDTiC47HG1rB8Nats0zK6/kCatR@vger.kernel.org X-Gm-Message-State: AOJu0Yy+xl97D+lOD+jQP0JRfrrxonDlAzypNsK13dZT5JRqWO6S9j9M ia7uQ9eu1ovMgJACBw0VPu5XyU+c+JgYc/VybKaerouXiOt10r9ueIj1D8XKAAwDPgfCX/H7+sn H6ndo X-Gm-Gg: ASbGncvIfEY1ltKmMSrVXUKLP2P2Yu7A9RyYIObWck61TApaU0HUdDANpYyqQakbLuk To7B7UvLgoqaNjGihqQ6YClMK0qFYinYXiyddgeGBAQ/OljgGYP6THcjFGGvfg0lxK6bBdc4W09 ZQacvYz9XKKjZbsEGBkAxTZ6/yoeeXZO+a+0SLNNw8MTQELVmb5cgDRKL8PSrOcCFyZR1V9jeJ5 2kgLyKlfpT1gzuwsffgxcRgwt4+pGB46md8Z3OhQGEFyo8xx7vjelUj1pcBNaenydkqJgHZWgc1 ez4gBYb80Ity6t61M4pJnt24DC/F2fvxRh4CKX3L4r8FKxpiTDMGNeZbpjWFzkGKIob0ATqLRx2 b1ycbmgWVC8ndc8BCRrrvOcf5DA18zVPXtwRDJOBGeUrDvWRjPnxJ2vkNYM4sdBqbmW3ZXWCDSh E7AJIFNJYpk9XPJFUeXYWPJA== X-Google-Smtp-Source: AGHT+IH1hgTRKxlBmdv3/+s0r8qrOSStemv1ar3m/W6lDxjJATxhY6Fk1qCy6ohGFpWQa2Uc9uQQXA== X-Received: by 2002:a05:6402:354c:b0:61c:9a23:fe9e with SMTP id 4fb4d7f45d1cf-61c9a23feabmr4788581a12.14.1756322685347; Wed, 27 Aug 2025 12:24:45 -0700 (PDT) Received: from raven.intern.cm-ag (p200300dc6f1d0f00023064fffe740809.dip0.t-ipconnect.de. [2003:dc:6f1d:f00:230:64ff:fe74:809]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-61cb7ce92bdsm1486735a12.10.2025.08.27.12.24.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Aug 2025 12:24:45 -0700 (PDT) From: Max Kellermann To: Slava.Dubeyko@ibm.com, xiubli@redhat.com, idryomov@gmail.com, amarkuze@redhat.com, ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Max Kellermann Subject: [PATCH] fs/ceph/addr: remove redundant field `nr_folios` Date: Wed, 27 Aug 2025 21:24:41 +0200 Message-ID: <20250827192441.475831-1-max.kellermann@ionos.com> X-Mailer: git-send-email 2.47.2 Precedence: bulk X-Mailing-List: ceph-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This variable was added by commit 590a2b5f0a9b ("ceph: convert ceph_writepages_start() to use filemap_get_folios_tag()"), but it was redundant and unnecessary right from the start, because it was just a copy of `fbatch.nr`. This patch just uses folio_batch_count(&ceph_wbc->fbatch) instead, but keeps the filemap_get_folios_tag() return value in a new local variable because calling folio_batch_count() would add unnecessary overhead when we already have the return value of filemap_get_folios_tag() in a register. Signed-off-by: Max Kellermann --- fs/ceph/addr.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index 8b202d789e93..179141aeaa26 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -597,7 +597,6 @@ struct ceph_writeback_ctl pgoff_t strip_unit_end; unsigned int wsize; - unsigned int nr_folios; unsigned int max_pages; unsigned int locked_pages; @@ -1033,7 +1032,6 @@ void ceph_init_writeback_ctl(struct address_space *mapping, ceph_wbc->strip_unit_end = 0; ceph_wbc->wsize = ceph_define_write_size(mapping); - ceph_wbc->nr_folios = 0; ceph_wbc->max_pages = 0; ceph_wbc->locked_pages = 0; @@ -1129,7 +1127,7 @@ static inline bool can_next_page_be_processed(struct ceph_writeback_ctl *ceph_wbc, unsigned index) { - return index < ceph_wbc->nr_folios && + return index < folio_batch_count(&ceph_wbc->fbatch) && ceph_wbc->locked_pages < ceph_wbc->max_pages; } @@ -1668,21 +1666,23 @@ static int ceph_writepages_start(struct address_space *mapping, tag_pages_for_writeback(mapping, ceph_wbc.index, ceph_wbc.end); while (!has_writeback_done(&ceph_wbc)) { + unsigned int nr_folios; + ceph_wbc.locked_pages = 0; ceph_wbc.max_pages = ceph_wbc.wsize >> PAGE_SHIFT; get_more_pages: ceph_folio_batch_reinit(&ceph_wbc); - ceph_wbc.nr_folios = filemap_get_folios_tag(mapping, - &ceph_wbc.index, - ceph_wbc.end, - ceph_wbc.tag, - &ceph_wbc.fbatch); + nr_folios = filemap_get_folios_tag(mapping, + &ceph_wbc.index, + ceph_wbc.end, + ceph_wbc.tag, + &ceph_wbc.fbatch); doutc(cl, "pagevec_lookup_range_tag for tag %#x got %d\n", - ceph_wbc.tag, ceph_wbc.nr_folios); + ceph_wbc.tag, nr_folios); - if (!ceph_wbc.nr_folios && !ceph_wbc.locked_pages) + if (!nr_folios && !ceph_wbc.locked_pages) break; process_folio_batch: @@ -1712,8 +1712,6 @@ static int ceph_writepages_start(struct address_space *mapping, ceph_wbc.strip_unit_end = 0; if (folio_batch_count(&ceph_wbc.fbatch) > 0) { - ceph_wbc.nr_folios = - folio_batch_count(&ceph_wbc.fbatch); goto process_folio_batch; } -- 2.47.2