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 3DDEA485CC3 for ; Tue, 18 Aug 2026 18:11:55 +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=1787076720; cv=none; b=MlQKlHNmvGaLT301nJFD2yCzDlykBmf86fhvwecknMhOH87RGn15/8jBWWx4WJIB6vc6Yms/pBpSqit04hwaiu9i4gduIlI72ze9fBjh/d8V5OMLboozx0TYwTllC9LbjHkW3CvVyMpQZ1J1p0Y0Hq3BO+kfSyVmHtAOH2WiaEw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787076720; c=relaxed/simple; bh=rWcD9UAVTx1Qu4X1tQhXaEYVpYkM9g/KFb6msHCmSJk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Jdlxs0kSy1OXEaSUXjLFdhiuXfZ4GT7PkVQLwKyXCDfQP6YHh/lUgDz+Pd3Z/+bNx57qvxljU3BNHbzRHZMvrVZMNm9xzWKX5EScfL/dWkn4+z8bds8roX3K1SIvXsH/YLHLsOLF/giWvgPl3y/K+eOjsrKzANC5r68p/wYtb9E= 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=QbPlUWcN; 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="QbPlUWcN" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-47fe2d179e2so57472f8f.1 for ; Tue, 18 Aug 2026 11:11:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1787076713; x=1787681513; 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=QbPlUWcNGUEJLGUoJSEPAMiBLpv/2oWlKA8B1JPOW3ipAXHtM2tYVJodMtHDWWpuEj +f2eokrqvSy/boGusHLxQ53BVMiwdPYxrLpBjNwvnCdYn9vS120wIiv1RS6nldM0nez5 oMXWubtlp3MJaY7IKP/SmGpRFgpURT029S9eHfoP26Euv8QYsDvPz7xR4xCuM2KsC2VG j9xpsbsy+nmFECPipy+kgKyhVDPdKJ/ag6z2wrBc6+vTMiOq8LMXByjZCqDsxQZOe4z5 elRWFJ5CnhN7QrYZgCIvsCOm9jLqJVUW7v9LPjl5jr1MMjtjMgrx4iOlQvL2CFT/5qtv c9oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787076713; x=1787681513; 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=O5GOfWTFzCYwNpsdh60hsHGdWbEVQ1v1Fi+DlzACMmOfbwjMQ8t523aKEG8RxclR5g nEPEKuxXyczdvyDRhhV5xDUn9ZbZtL8aqglP86EF9Ir51f8+pbn9qEBCt+gsuJPIg9dG PAHTyNExzHG2gt/KkeB+rC9FPZ03qfc9+iKZtbiUsMAz8fF2yza08WUxavjqJYn3ki/4 k7THCDP4X5IPznCET/yyEUK5VlAiEyy51MLfO3JnNYfA226eUA6JMdi88cDd/GoPTawv KpVormmnXWxXWBjgu4m5jabuohqhkadAhjNS14spG4zRymt+HdDP6sOAUpsHhPOVI2Y+ 1Syw== X-Forwarded-Encrypted: i=1; AHgh+Rr0dNskW4MToI7dXsGrlK+8jhgbvTsctRJgiHfyCzPto+tgClJa4t7fcZe7WxnDvSdkQF46LK+PB+U6Bpg=@vger.kernel.org X-Gm-Message-State: AOJu0Yxp6K9sSada3BaiLdzyZgTUIYOMfcp2oCabCG1GFaC/YyQG3Ewg CjDAdHDoYRYTjAVgstUVU2L1fuTCYPqjsy+hVxts3iuKT8hdynjYobYmbduA23JUxqU= X-Gm-Gg: AR+sD12susqseTliVXv1aITYRjD+xZoGfTjLkUY8ZQJI6lQm9doWv/IyBGBQGpNz0Qk vvH2ABKSg7g+J/3rpKrY4at1T7qZqTesZq8PnyN7FBWFMmMo3wPzas647F2mPmel9OLleCDrFqi ec2QE+TfQj3GmJXA5yZ44FhEDyngz/TxYoRWsVvgoNRa4hLcn8XgKrx+sDbDMFq8k+m0jvlSad/ +WTOIxA2W5Z8AqwVuLFBGJikX+YmcCbjZTsXKaJmA5Mw2f5e6iJddO0yQTWFBhcsnd9+85rvh6O DZeKGk65yAWukD9FkIsc7qKrze71qTHQ+arn21UPPUwUr+g5jkvloqaqO95ABuF1mWyPw88CeoT 0BOntzjdMIf3bt3kCxvCl4lRsQqIgHJAgP/rE65rEiFUU0Je6lVBB+/ssGDxGH70oJjYTQb8+l8 CzsCcMB1+5/KDoZk582BuFM0Ehc86NqQ+RrpDY/7GBeHaT9hr19U8lzZ9qZsgR7/xUqu12EnGNo guvpqanHbBMZ2D5dzZpSXK17ZxHy0VNs09+ZhptzOXiRYTU2bmHtxvZjktJrjuz X-Received: by 2002:a05:6000:2891:b0:482:a909:53d3 with SMTP id ffacd0b85a97d-482a90953f4mr16828977f8f.2.1787076713574; Tue, 18 Aug 2026 11:11:53 -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-482a5a3b896sm14302641f8f.16.2026.08.18.11.11.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Aug 2026 11:11:53 -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 v4 07/12] fs/ceph/super: reorder fields to eliminate padding holes Date: Tue, 18 Aug 2026 20:11:39 +0200 Message-ID: <20260818181144.3541770-8-max.kellermann@ionos.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260818181144.3541770-1-max.kellermann@ionos.com> References: <20260818181144.3541770-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