From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.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 A254B3E8C74 for ; Mon, 6 Jul 2026 07:25:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783322731; cv=none; b=jVfgGGShuYHeW6peA1VwerMr9nn8KA1DT78PimqwZiorOq33QZxqDyiK6IA4Kb7M5payynfe+szfknzVtODfWdC4FneDVHujkpcRDK88bGHuikBCbwGEf8ezPMVwezxTG2ZpMvZywz/nlpSP3+TTVl4yy/FwifYM1nn0onQz/Bg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783322731; c=relaxed/simple; bh=DwDkodbW1ly4jC6ZK+lnuPyhZZq08agsspgS0AHIn2g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sJ4Oz4AbhbGpSXZHGpviJ3BGcQ74xmILPrSZipAq0xtDYa0OD5CgpUDbyDruWl1xwIAuvjbdwIxa0SFfSaAvb2F9fKmQcNJh2OsUlGTiRgUh4kVMOF8xYKBntfdmExW93SVyQkEXHPPTYkyaavv+XSilhC0cD8bRH8Kq/+6C4Pg= 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=L6gu4giz; arc=none smtp.client-ip=209.85.128.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="L6gu4giz" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-493bc8fda98so29024335e9.0 for ; Mon, 06 Jul 2026 00:25:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1783322709; x=1783927509; 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; bh=qsI3ahW87ZFKuZWFJmkvVpXNmYLO039xLtbsuV2z/ZE=; b=L6gu4giznIxIbm9Q9UHOcD4HK9Ns4mwq3SNhDRc36iYA1ejhxiqjDAvgtOeEcaNJvt tcpW0NMZ4mfNRdSKWDbE3c+1UWXXKBZgv6Y9JuPC92IiCf1WB50HqLsw6prxDx5yacCl 6h90xjRulno23zWBehfcS5U4sWwgSqd8bCwmxUV1zqbVlduBMOtb29eYvmbfubKH0FaD r4VvhpOve8vtj72YtuEPBCNdNCk8eb5FaUn/OUd0P2tjbZExwajByyxfPaX3RsCZh37K e6PLwWzYxhmBkHzLzIPrpVLnxlmb5NlkhE8zp77YGlhltqmtDPV9ZT5pLEdNfsrM6LxZ OvvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783322709; x=1783927509; 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; bh=qsI3ahW87ZFKuZWFJmkvVpXNmYLO039xLtbsuV2z/ZE=; b=iEPIXiP1ddBLJB/Uy7YVDGckPb1jyK1UhuArw0OXJM901VHfGnD3L3Mva2T493zxgA TIRyKAhp56Txb85+O4Aa7LU7rGn0jYgUYfZNyf2YnC2NbCDU0PlvLvqeQQUd+TaMsknf djOqmRBRI0rK0OjGnLwSNQ0R+I3QuaGVjcU0tC/MRoCTYPn9Wd8JiaYtOTAmegN5g/5S eHPJ5pK24vKhZ84xvZUoH4qe8AavnBOV+UV+HdqZPirQWchHOsUo9naqxdASQ9zCmoXz 3KK3H/zdHsk8EFbmF5kwjxSG82KHqeAEC3VIvoLp8/zZc1Y7EEU3ZDaqDS8TC0xx4pAk Nyuw== X-Forwarded-Encrypted: i=1; AHgh+RoHMryCZgU8Q3z/J0ZGIYa33K/e+qXE5zrdZbD/o73yU0XrDFFutyhwDlqHn38hy3wHhY4wnx37FnzYh/4=@vger.kernel.org X-Gm-Message-State: AOJu0Yznw/bLBWvki6JLhCJXKjBX88Kv08CJcITwr1HsZI4627Zhu3rY ImeD6K5u2cGMGhHQw4RZbTWL+mxildFO30CuuxFoPJmksn6cYooHGXxEAicG8yHjYyoaxO1mmIJ 6OqXE02s= X-Gm-Gg: AfdE7cmVbES9WmXoNGgqDyhKpGduxJE/tm31OOASHkboBVtbEqx0ed0P+r827PYsfnh +KPzGyyzxRQDD6X93ZR+ted70rBfZBdAQXQFFmq8Wl3I2UpBdHLiPMRvWAhJDYddyUjAWf9P1QE anNceYjLQNrOHDiXrPzgH/6TQGeMkOfa3m8dfpKqyGZQ7Bk7Q819o4JaftiCIUuL85LqB5PtJuy Ej1uwtwImvQhDM0suXTTihpErzVgI3GPj5rn3RfaWoocF5z9xaRUmIwDrtLg8Hi6ftbs+XNWCog Kmh8w29LavS0usR//INE9xp4TTQeFhyH+ZxKo8CKhWlLScHY3gOyKXHmlwF2nmy8pdXgk/CBWay iaow0rlaxpj1iClU7duU6F6sXBwlbAz1UbAb5ZoFn+XFu281BZrBt6iWKtMDWKTKJEJ9a7dp8sM V0ytFOBjQRXSENEYOE1oeDskmTQqQGHhDNkNyl0MNZ07M1G28IFfEuJyGa0BPXiW3YHv/UwjsNB qrHuemhXDM/4f5e X-Received: by 2002:a05:600c:8a16:10b0:493:a613:56b2 with SMTP id 5b1f17b1804b1-493d11ceeb6mr78265185e9.8.1783322708704; Mon, 06 Jul 2026 00:25:08 -0700 (PDT) Received: from raven.intern.cm-ag (p200300dc6f45eb00023064fffe740809.dip0.t-ipconnect.de. [2003:dc:6f45:eb00:230:64ff:fe74:809]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47a9de1d905sm22324916f8f.2.2026.07.06.00.25.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jul 2026 00:25:08 -0700 (PDT) From: Max Kellermann To: idryomov@gmail.com, amarkuze@redhat.com, ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Max Kellermann Subject: [PATCH v2 18/18] fs/ceph/super: remove redundant field `ceph_snap_realm.parent_ino` Date: Mon, 6 Jul 2026 09:24:49 +0200 Message-ID: <20260706072450.3920010-19-max.kellermann@ionos.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260706072450.3920010-1-max.kellermann@ionos.com> References: <20260706072450.3920010-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 the struct by another 8 bytes. Signed-off-by: Max Kellermann --- fs/ceph/mds_client.c | 4 ++-- fs/ceph/snap.c | 5 ++--- fs/ceph/super.h | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index b4a1c126cbc9..f0b9d653ffd1 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -5044,10 +5044,10 @@ static int encode_snap_realms(struct ceph_mds_client *mdsc, } doutc(cl, " adding snap realm %llx seq %lld parent %llx\n", - realm->ino, realm->seq, realm->parent_ino); + realm->ino, realm->seq, realm->parent ? realm->parent->ino : 0); sr_rec.ino = cpu_to_le64(realm->ino); sr_rec.seq = cpu_to_le64(realm->seq); - sr_rec.parent = cpu_to_le64(realm->parent_ino); + sr_rec.parent = cpu_to_le64(realm->parent ? realm->parent->ino : 0); err = ceph_pagelist_append(pagelist, &sr_rec, sizeof(sr_rec)); if (err) diff --git a/fs/ceph/snap.c b/fs/ceph/snap.c index 12f80df4b651..a5f8f3f95f3b 100644 --- a/fs/ceph/snap.c +++ b/fs/ceph/snap.c @@ -297,7 +297,7 @@ static int adjust_snap_realm_parent(struct ceph_mds_client *mdsc, lockdep_assert_held_write(&mdsc->snap_rwsem); - if (realm->parent_ino == parentino) + if (realm->parent && realm->parent->ino == parentino) return 0; parent = ceph_lookup_snap_realm(mdsc, parentino); @@ -307,12 +307,11 @@ static int adjust_snap_realm_parent(struct ceph_mds_client *mdsc, return PTR_ERR(parent); } doutc(cl, "%llx %p: %llx %p -> %llx %p\n", realm->ino, realm, - realm->parent_ino, realm->parent, parentino, parent); + realm->parent ? realm->parent->ino : 0, realm->parent, parentino, parent); if (realm->parent) { list_del_init(&realm->child_item); ceph_put_snap_realm(mdsc, realm->parent); } - realm->parent_ino = parentino; realm->parent = parent; list_add(&realm->child_item, &parent->children); return 1; diff --git a/fs/ceph/super.h b/fs/ceph/super.h index ca4db56ef2d0..86a5929ee5d2 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h @@ -1023,7 +1023,6 @@ struct ceph_snap_realm { struct rb_node node; u64 created, seq; - u64 parent_ino; u64 parent_since; /* snapid when our current parent became so */ u64 *prior_parent_snaps; /* snaps inherited from any parents we had prior to parent_since */ -- 2.47.3