From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) (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 D4D303876C5 for ; Mon, 24 Aug 2026 18:42:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787596937; cv=none; b=EhhbD6yi81KGdy3qjlNrrcY8/mPZB1SVtmYzsJb93KGlku0H3JA3DK4z1/iWlw39OS/EPkkDV7ALEHwpg26R3j/yUDesdfFgH6TEhe++TsUNLMNBO0f9SRGHXTzDl84ao+IXH1Y9MVl6IwSgCi3tBbxTTv26CLqh7fnBd8M9Ey0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787596937; c=relaxed/simple; bh=rWcD9UAVTx1Qu4X1tQhXaEYVpYkM9g/KFb6msHCmSJk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Aq1IG/zMWQQkgmIwa9VIA9fGh4MfurZO4h39trpO/BLLx3RCd+UYjpBAey3FVJK5TJ8JyRthdzzN/sFSX8EO9FffwW3c6M4Pm7r5wYlUAVMxvLyUAYafU2eKqSSl2Ralmf4q/hgx9ucNa9ZVjfcEEmlGhM/39UWCSf6SVc29eNA= 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=OL++xASa; arc=none smtp.client-ip=209.85.218.46 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="OL++xASa" Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-c1712a04ddaso651107366b.2 for ; Mon, 24 Aug 2026 11:42:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1787596933; x=1788201733; 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=iaBPZv5XdoOUADi4qlmlEchxRuZesTRRDOJ68FGWcG0=; b=OL++xASaRsJeNhP9JCxMM91wsuH1Z+7Z4ImtK71Y4cNmyGCBFWCjJ17Ugvjm6flbBa EtfqnWcOvvchK6B36Nhi0miZSORmHT1SubiqXg1uZQbGTctOQO2DHQUH5rVXOZKt24+b W+18tRzbsbjmtqboGVu+Vwv3ouTs6CzkPEyWS2eimkb8HvYtyb3IaPbLYrmswXcbENyq u5XlLarjHHmwvi8IufqteRxVIwlArcfSIZlivdA+3mAmyIFY01/frbmpXyrrzbivekZx lIYkAtZhRpTOCwm/EVCYJqwFf51t+nDS7skTBMi19ebb9j0R9PXSeMPd0/awKKJRwCCE +E2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787596933; x=1788201733; 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=iaBPZv5XdoOUADi4qlmlEchxRuZesTRRDOJ68FGWcG0=; b=fV8UDzHl0LD3pBMPUQcdd3cv8r0Pj7y2oJOGTNHPLGoEu9/mvy4NOVlrt9gTABVQgG ecEQ/3UW1urMTC1htX5eEJmPBP+xh3L9zvdhMIELPPbcd8u5NWJLuhiUvV2G7VBwKBTl 5Nx0BdOYVT1CqTqYu2SIJEHKYt1Lt2ZU3CytNPmkbtexl+P9dV6U74v5RbBgz3OxfLE+ Gkrz9/21ALIFSpZ67SQboxALXwOiYit1HPG8KjxXfxOvdIqnvQ6MIU8pFWMs0mQ12Oqu jh2v0+4xgVvkP7LJ+EKUEM1JWsyHP5CJ3r+VL4ru4jiIBQUUpiCMgAXmT4ze6pRjOE5a BVsg== X-Forwarded-Encrypted: i=1; AHgh+RplvIHR5qg6W4jAnN5OGEmMtux7UZIngYEOWJ92US4X9X8gJcZsBfhMOEo/EjpWa6okbC3k0SKBHN7xCLU=@vger.kernel.org X-Gm-Message-State: AFuF++naUrfguemZ/iQ/HHiQN/MQqjkBpJLLWQIZl4L1wPJycyCzmXA0 V0dmdeD38v6gBvWRlW6/zvtkpmHsGw1f1Q12SGOHBtwcpnM8TqIhqCXQA1q9xj2thMU= X-Gm-Gg: AR+sD13d5yNyV7fIBlo0jO5HZGBCgODkOB1Jf4kE7GqArioD0q9wccQVukM0lXyjedM tSuKH5zssRAggy4YfACUFWOqsx7WyGrdwBcG3H/woX3jzsVem9jFuCZZsYI94oRmcVzT6hSUnIu XmPHXKxHF25yNWj1PittMNxz8zzxBq4A1s/5Ob/qqKGPlnhCO6LYy8ECX6oixwLULvSDU57vy+6 Aert8BgTr2ZbD8OHqTSKMAhXekNDb4G0gP/qQpqDB2KO7KYYpldoQkaucglBvwV/hVhp3dfFSlp 2g+ERPQofI8lvdRYTaVrZyFL8shzV+Kba7Y7G4H2WSDTjLPJ4But5FcA/P76Z+f8CuYnRtBxEw8 9Vhe/jL3uhld+bW0kkNUHlECbPQ+GHW5+BwVrP8fG3+8rzhzF5aHQom69DiCK7mjz4VRGM/oHuq NPi4JeMZAEHtRx4GfhMUQ8VZIye/E6nkeCiC92XagFMtMQYDSxpGOUuE3l5VyqHXJx1hpGuhvfc 5zldX/1qjujfw/3ZWYurSKDOFLN8bQlMGwLogfvdWsooS4blZWrvoj2iaYmo2+X X-Received: by 2002:a17:906:7316:b0:c19:45e3:2f57 with SMTP id a640c23a62f3a-c2491cbca79mr2240592666b.9.1787596933001; Mon, 24 Aug 2026 11:42:13 -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 a640c23a62f3a-c249606a8fasm1533526066b.8.2026.08.24.11.42.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Aug 2026 11:42:12 -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 v5 06/11] fs/ceph/super: reorder fields to eliminate padding holes Date: Mon, 24 Aug 2026 20:41:54 +0200 Message-ID: <20260824184159.240821-7-max.kellermann@ionos.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260824184159.240821-1-max.kellermann@ionos.com> References: <20260824184159.240821-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 reduces the size of `struct ceph_inode_info` by 32 bytes. Signed-off-by: Max Kellermann --- fs/ceph/super.h | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/fs/ceph/super.h b/fs/ceph/super.h index 67411a5d8b91..05452bc7eac1 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h @@ -250,6 +250,9 @@ struct ceph_cap_flush { */ struct ceph_cap_snap { refcount_t nref; + + umode_t mode; + struct list_head ci_item; struct ceph_cap_flush cap_flush; @@ -258,7 +261,6 @@ struct ceph_cap_snap { int issued, dirty; struct ceph_snap_context *context; - umode_t mode; kuid_t uid; kgid_t gid; @@ -268,11 +270,12 @@ struct ceph_cap_snap { u64 size; u64 change_attr; struct timespec64 mtime, atime, ctime, btime; - u32 time_warp_seq; u64 truncate_size; u32 truncate_seq; - bool writing; /* a sync write is still in progress */ + u32 time_warp_seq; int dirty_pages; /* dirty pages awaiting writeback */ + + bool writing; /* a sync write is still in progress */ bool inline_data; bool need_flush; }; @@ -317,8 +320,8 @@ struct ceph_inode_xattr { struct rb_node node; const char *name; - int name_len; const char *val; + int name_len; int val_len; bool dirty; @@ -379,9 +382,9 @@ struct ceph_inode_info { spinlock_t i_ceph_lock; + u32 i_time_warp_seq; u64 i_version; u64 i_inline_version; - u32 i_time_warp_seq; unsigned long i_ceph_flags; atomic64_t i_release_count; @@ -412,8 +415,8 @@ struct ceph_inode_info { s32 i_dir_pin; - struct rb_root i_fragtree; int i_fragtree_nsplits; + struct rb_root i_fragtree; struct mutex i_fragtree_mutex; struct ceph_inode_xattrs_info i_xattrs; @@ -453,7 +456,6 @@ struct ceph_inode_info { struct list_head i_cap_snaps; /* snapped state pending flush to mds */ struct ceph_snap_context *i_head_snapc; /* set if wr_buffer_head > 0 or dirty|flushing caps */ - unsigned i_snap_caps; /* cap bits for snapped files */ /* * Written under i_ceph_lock, read via READ_ONCE() * from diagnostic paths. @@ -465,8 +467,8 @@ struct ceph_inode_info { int i_nr_by_mode[CEPH_FILE_MODE_BITS]; /* open file counts */ struct mutex i_truncate_mutex; - u32 i_truncate_seq; /* last truncate to smaller size */ u64 i_truncate_size; /* and the size we last truncated down to */ + u32 i_truncate_seq; /* last truncate to smaller size */ int i_truncate_pending; /* still need to call vmtruncate */ #ifdef CONFIG_FS_ENCRYPTION @@ -495,6 +497,8 @@ struct ceph_inode_info { struct list_head i_unsafe_iops; /* uncommitted mds inode ops */ spinlock_t i_unsafe_lock; + unsigned int i_snap_caps; /* cap bits for snapped files */ + union { struct ceph_snap_realm *i_snap_realm; /* snap realm (if caps) */ struct ceph_snapid_map *i_snapid_map; /* snapid -> dev_t */ -- 2.47.3