From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (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 847A939B97E for ; Wed, 12 Aug 2026 20:30:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786566607; cv=none; b=FSXKqQgsSI+AnR2mgopjYjqgYE9mkzabF10s7F/5KAJDVoTH1FQ/Ikn8FqI9FRIbCnXo9+ZEVFLbnCzTugwJHHC2vw+PjvD3Vsg7GFUAHttwV30NbYgBgn3qRZhBVO2p2yF3vCDdGC3wLiQSH0YnyNJJ/+WxlSlIOpKecU45NY4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786566607; c=relaxed/simple; bh=9XEOCpJ92dHTmRtWjKTA/Gb5ilHulLiXFfGINfxa9k4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dlfRe6QjoEFAw0Som0ni1pIBXeSm9ZBDOp9qgkr15KYq1n8g1O9J1A1q3c0zwQwgToAerRoyTripatA4AFre9TAcRv2eQVRz7et3oTztTJT2Qcyctp0SieYF9abkKSiFBzmeXnPdnJc1xwEfpNzHym+fmXEOAn1FTZKGebaIc7g= 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=VXLzODNN; arc=none smtp.client-ip=209.85.221.48 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="VXLzODNN" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-47fd66a094eso524579f8f.3 for ; Wed, 12 Aug 2026 13:30:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1786566597; x=1787171397; 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:content-type; bh=00c8rcUzxLCd7wLsw23nlyAOLrwAoUbKznwY4vUbxqs=; b=VXLzODNNZwSOSHzPRe+TDed9G0cS7MrRExehI6//A1vP/Eqq1j/z1+aKLpiaBecpCx 2eHKAWLZRMBYtXtdHZHBtqt/oG/PyeIE0P6GvPq101PXvvP6DcO90lJ3Q7yqNZppQD/o /sOoSMttMTvMGqfw/+zaS/y8rmVWiWhAofAvGUJmE3lnZz/gvra8ui3q3B0VCr6WccJy Q4uikeNh/gnqzi9b0LpgKdvUOuYXi+m+0SAdSwvXtNKwhzBU6D1VMGqPyvfnpHZ90Giz 8q57IQ0O6vn/bIQ59WzPfGGjk5Mxa9dqss+hCFklOtoovPfuOWNC/tXDTR3w4o/WyULw sVrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786566597; x=1787171397; 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:content-type; bh=00c8rcUzxLCd7wLsw23nlyAOLrwAoUbKznwY4vUbxqs=; b=U2ZX7DFLwkKZ8smJ3bnq6PrPh9ofAzn98TWQvH3DTOm3C0EQ6PTGA0mnuEmx3ravJa zZuFTJmfqpdGLUXD8mchL2uWuWpF8YhZF/w6qEfVnAnk3m5z0QmVHXMK0ba5cqIfIqqH m/g83Z495UzxJ9SYv3fXOPse/UNpHjr/gkrSflXgcTMCNq5KQrsPWwM1GvoIrA4jPEdb xaFVuHXktwIu8dIwMzrbwkHuvOl7nEiShAUBVNr/F+nzqJ/jX7MwAwJxLLNhEwLpQT2b XazZ6TsitAz91TG63Wobm8p/87XEqSF2LpFk8Mgne+R5R4mOhl+LH0Z4Eikcnf2zt1Ql yuWQ== X-Forwarded-Encrypted: i=1; AHgh+Rr8nCmcjGaah9zhruR0QeJAxkEdO5e+mG0r7ZqQPZuIdfkc4BFIzMRnDu8YtV94e3+qexgdAA9zgFk4aS4=@vger.kernel.org X-Gm-Message-State: AOJu0YweqtBXpY6WIL4NotkTHd9cFJowSj+HI7l6G7mCtILqTRoKvbBo PmFnLNayZTU4gK3ekYlg8NvcmwCvgypaXRFhG5VUKK2DPbosmioaFSl/Jv15Lzgz1vI= X-Gm-Gg: AR+sD106w3RpVR2UBigV7A5skCGcRIVzEz8fR15NuGo8W3IDcCiLknQUkxgiJMn6UD9 oFvf7XcgP4WRayCIIaDpt7Vj0C5HSJAgGuz7H1oHa5zusEPzhL9LfKI8GcrNiCovXNs2oIv2tF8 w55sGQNIDlQ/wA2o7FlKLZ/lVJ3bKlp9H6QX7YUvq2OhiyS7Ko3X6ENpdj7VmqZm3TEZ5rASYc2 48N87s0QFOoQh/zEWB1i3pNpc4tuRSkPhKS+CWoWA1L2aok2IHf3tG8cNMWRw8Ptd0wBvH9oadf VPz1W8HSKDEUWY1wJxaPI/VjHD4nfWcy1t2LdT/83NFLP3etZU9twkopLFw7++NpIC/Zauh38DX Rr0yzfC23aXstUc2vtXYNHjNgs/BknUwHv5MUHrRb50q/oPW93T7Bew/Js0XuQppsHxu4IGiluk mExCVT86NSm3Qi4ojEer115L7thygD2tBQ1s8Dfossw10rJUtjkq0eZYct3pGo1s8bMMz0s15ma 8dKnOXuL+TvVEit40iiaOLLUYQZb4Ay5T53XFIITGHgkiu5Bao/dG58XXyi19xV X-Received: by 2002:adf:e19e:0:b0:47f:8488:50f0 with SMTP id ffacd0b85a97d-48159c904c7mr1168021f8f.4.1786566597358; Wed, 12 Aug 2026 13:29:57 -0700 (PDT) Received: from raven.intern.cm-ag (p200300dc6f02b200023064fffe740809.dip0.t-ipconnect.de. [2003:dc:6f02:b200:230:64ff:fe74:809]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4815a569ab3sm328979f8f.11.2026.08.12.13.29.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2026 13:29:56 -0700 (PDT) From: Max Kellermann To: idryomov@gmail.com, amarkuze@redhat.com, xiubo.li@clyso.com, ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Max Kellermann Subject: [PATCH v3 02/12] fs/ceph/super: make field `i_truncate_pagecache_size` optional Date: Wed, 12 Aug 2026 22:29:39 +0200 Message-ID: <20260812202950.1800340-3-max.kellermann@ionos.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260812202950.1800340-1-max.kellermann@ionos.com> References: <20260812202950.1800340-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 This field is only used with CONFIG_FS_ENCRYPTION; without it, it always equals `i_truncate_size`. This reduces the size of `struct ceph_inode_info` by 8 bytes on kernels that have filesystem encryption disabled. Signed-off-by: Max Kellermann --- fs/ceph/inode.c | 8 ++++++-- fs/ceph/super.h | 11 +++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index 61d7c0b8161f..bdb82f123033 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -681,7 +681,9 @@ struct inode *ceph_alloc_inode(struct super_block *sb) ci->i_truncate_seq = 0; ci->i_truncate_size = 0; ci->i_truncate_pending = 0; +#ifdef CONFIG_FS_ENCRYPTION ci->i_truncate_pagecache_size = 0; +#endif ci->i_max_size = 0; ci->i_reported_size = 0; @@ -866,6 +868,7 @@ int ceph_fill_file_size(struct inode *inode, int issued, ci->i_truncate_size = truncate_size; +#ifdef CONFIG_FS_ENCRYPTION if (IS_ENCRYPTED(inode)) { doutc(cl, "truncate_pagecache_size %lld -> %llu\n", ci->i_truncate_pagecache_size, size); @@ -873,6 +876,7 @@ int ceph_fill_file_size(struct inode *inode, int issued, } else { ci->i_truncate_pagecache_size = truncate_size; } +#endif } return queue_trunc; } @@ -2332,7 +2336,7 @@ void __ceph_do_pending_vmtruncate(struct inode *inode) /* there should be no reader or writer */ WARN_ON_ONCE(ci->i_rd_ref || ci->i_wr_ref); - to = ci->i_truncate_pagecache_size; + to = ceph_get_truncate_pagecache_size(ci); wrbuffer_refs = ci->i_wrbuffer_ref; doutc(cl, "%p %llx.%llx (%d) to %lld\n", inode, ceph_vinop(inode), ci->i_truncate_pending, to); @@ -2342,7 +2346,7 @@ void __ceph_do_pending_vmtruncate(struct inode *inode) truncate_pagecache(inode, to); spin_lock(&ci->i_ceph_lock); - if (to == ci->i_truncate_pagecache_size) { + if (to == ceph_get_truncate_pagecache_size(ci)) { ci->i_truncate_pending = 0; finish = 1; } diff --git a/fs/ceph/super.h b/fs/ceph/super.h index 3cbd320b49a8..7023af704e14 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h @@ -468,11 +468,14 @@ struct ceph_inode_info { u32 i_truncate_seq; /* last truncate to smaller size */ u64 i_truncate_size; /* and the size we last truncated down to */ int i_truncate_pending; /* still need to call vmtruncate */ + +#ifdef CONFIG_FS_ENCRYPTION /* * For none fscrypt case it equals to i_truncate_size or it will * equals to fscrypt_file_size */ u64 i_truncate_pagecache_size; +#endif u64 i_max_size; /* max file size authorized by mds */ u64 i_reported_size; /* (max_)size reported to or requested of mds */ @@ -667,6 +670,14 @@ static inline struct inode *ceph_find_inode(struct super_block *sb, return ilookup5(sb, (unsigned long)vino.ino, ceph_ino_compare, &vino); } +static inline u64 ceph_get_truncate_pagecache_size(const struct ceph_inode_info *ci) +{ +#ifdef CONFIG_FS_ENCRYPTION + return ci->i_truncate_pagecache_size; +#else + return ci->i_truncate_size; +#endif +} /* * Ceph inode. -- 2.47.3