From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (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 EA9B139CCF0 for ; Wed, 12 Aug 2026 20:30:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786566607; cv=none; b=UC+HnF54NV8BnS6s3W1VaNEKwTrG0snYCrlTqxQcoovmbzPKIBUpUMyNeQRzr1KyjD9C82PYNm638p89VmBcA9WCVppjdvQH5qfDXaLPNn68IO3rbQPQbV7cXoEWxfqumPmr8T8RPqbFfY+VkC8lgTFmp3JLsfwM3r5OWGhbJM4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786566607; c=relaxed/simple; bh=rWcD9UAVTx1Qu4X1tQhXaEYVpYkM9g/KFb6msHCmSJk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YwL//kGr6QzWd04AYgpu/fAPRe2bZyxVlhnbfA3XgoCiIQ+W1ZMLBq0fUNIANYvp9UZ467C8FkWafhxHprwjDPKmBIff2+EMvlYricNIy3uQNQrAD7meBEv/1bstdywhe9FIpJLvefSKwTiLbXKiBY5IsjOjyHspW51zqf5YpPU= 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=hkE7Rw/U; arc=none smtp.client-ip=209.85.221.52 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="hkE7Rw/U" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-47f92e3c14bso1069029f8f.0 for ; Wed, 12 Aug 2026 13:30:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1786566600; x=1787171400; 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=hkE7Rw/UU12gk1Rds71jD9DarvLak7qJPVa+TCc0Qxi8yo+4qL8Vsmh5wrtuUX4Glc OmWbdBUxO7M3uWB0fV4dSkPjag40D50nBc6xqacsyknyu6uHh5giS8xJgC+hepPfm4iJ ow+KYOC09REHJFuawTk1YKw4VQxoSEEDrBDMcd9hmq76G2S1ZRXvy+7D6pNWjwWMwqQT yW8bfnLzR+IANn8s4ohH0d0g/FIZhoZdA/90WvR2BC02uTHizE3v4MQW12HjMz1my3oA 8yWW+Jig92+HTPZZx59z5W7vDl6ECWT5XubEMjPbuYbdGlnGOmduOWcn2kDcYVoN7eBl d9CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786566600; x=1787171400; 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=QcNpyAO8jyGUisxOpQPrwKAASnWe0Nax4GS+1NN5c+9G6QFHf4r/yRcYyMX1d2u/9z e3b9eFtln2vjmDy4tnWef2S/G31sEMg5mxwBk5u9nZnoBx/w6VUxsXeyGpmrdyyMPQXI Lz+2J8W6kDplGp+FYEJmt7GDNl2F+T1jOJhFxJBd8mZH3UZ6+FEWQA3vDto+F5KdBpqH jTXPfFiALFTkmEUPRQJdJFviTiRfSYD4JlNyhqK1yRFK/sI9wN/zQKa3tq5U1+IAM9XC YFvv3Sindd3tX0i3oOOiCLiWREYboaqOme+oBrUhDLGEhSs2SaNTMsD4+xJ7ui7tnw8m lebA== X-Forwarded-Encrypted: i=1; AHgh+Rofpc0nSdHD5lFDEExDyYHx/VldUzLdsPsVhUTd4I9vARVtxgRIy8fEecTYBoF/aPhZOJ0bb4OeOPLtH8w=@vger.kernel.org X-Gm-Message-State: AOJu0YwlKK/OKCk1NsyS8zvxIlwG9Zic4Sh6YMoElzPwnSM9ZGzMkSxx jzYEsRpoZSE+exUXzs87UveBKlkFRrj+NFjro+d0oy4/kYhIJVRkg30zsr4bQq4VlZs= X-Gm-Gg: AR+sD12znGcbEEyqVxjCFHUatGNX/fwJ8LWpzLvk3ITa8sjNUvz7DLm1veeYRk12Nxf 91IxW84tf3B6LCOBilMj/fjJunWmCb8dr4CBYyMEcGF5lhNuKuMtCxKv3Bq6i9UqOzzg7xn15fR HSIJ0NxfeeBNQTuhGAk6B8C8jBMa5xWqOfFn8F9I8V/hHY1HaogEqCtHQaJVDWjm7ndo+9zJcFk m0Jz6MQ5TTmgrLL1V/b7ET9KCgrJrGpWGd/UROUIlChbY5bS95oTBjiLM6B6aOgLb/Sf8mokkhq HYe/+WbmWlnTs6opHcOtzvhsSK5NBUi/MqjxvOGZrmmq/ocSTWADf52LkThUyITvgN9t1TC9cHK OeoVsjTTgpTyXj1Po7QxCu9NuTf3zSk0jTkHqWFEmn+01UkEAh67dZeKk13PFNmPeUGTrnrvisr TPcHPsSs2N4P3+7IMwuqcKmqdjqsbKGhX3AKldYtu6dAW4v4+pFM0judyjhCHJiPs5g2nLz666j THrFzPHqMln4jcGsgAjJ4XudvW+woeByMFWIbnkoGP0lIootSSosrZ3dSpWln3H X-Received: by 2002:a05:6000:2304:b0:47f:81c4:36a5 with SMTP id ffacd0b85a97d-48159fe3877mr972832f8f.15.1786566600564; Wed, 12 Aug 2026 13:30:00 -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.30.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2026 13:30:00 -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 07/12] fs/ceph/super: reorder fields to eliminate padding holes Date: Wed, 12 Aug 2026 22:29:44 +0200 Message-ID: <20260812202950.1800340-8-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 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