From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) (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 87557338939 for ; Mon, 6 Jul 2026 07:25:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783322713; cv=none; b=sy213xeLm6+tmy4NeDngZjUV7jhmqs4pFIOIYLO32Eelf7Joqn0W5nVQaSD/DnakrJ0lzhbuorLb8lMe1358hO0yP+Z47TKSms39rML+wkNQCfJswl1f20bSkjHpAbxJDa1z1yPrE9nYg8P0FjLZ2razpwz4NJqcVzcOUMOF+VA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783322713; c=relaxed/simple; bh=vZ7gRo95tF/kqgzTVygqtXNVLMo92lelt/8iAfWrtpE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZIFRXzJQAJShghPLHzMGjBcjbo/Wgxj2LETtodvPWl10ciwOxPcNpqNq7goIqj6yynZ4C3Lla3FFtmSMO2NTCW5sjYroMhwK1RexBFo0inFqDP/HU7Tcfy4JdjjId98C/jA1kXxt9OV63w3UEvrY5cYRhm9okEhcWTFaOERiRug= 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=Rs8ocuvc; arc=none smtp.client-ip=209.85.221.44 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="Rs8ocuvc" Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-474303f3c72so1522056f8f.0 for ; Mon, 06 Jul 2026 00:25:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1783322701; x=1783927501; 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=/h3RiEJriMYlQ3k6GEtIrqFIdNALC21eRy/CEabRiBs=; b=Rs8ocuvcHCMHQZvbJ5nW4FcGo72nCBUj9DcnIQFVCWhR4J6/v4ngsVi8ey69BF2iC9 rjFj5TdpUX878/YhlHmJ3UwG74X9K9nYOeVD/5nEFOhfGG5HvZWgfjdorzs8AUivA5RL yhpcNYfmjPDUiCz7TCRIBAEORBJycrKZTsY7FIIZwCtnOEBoYNFtD6IfVXlD5AR5jPyF j0TDuMVHxqifsOJZdRzN9ylBbPsCbLW4n1DX38ABEwvRcxugMgIbMHBqDaer6+iHColV kV4wExJ13wJsG5AvICE1jspgCBqD3OwTKVF8jR6cljq7vQmSQeZBI1K/yFDSrsdS3T+V y3uQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783322701; x=1783927501; 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=/h3RiEJriMYlQ3k6GEtIrqFIdNALC21eRy/CEabRiBs=; b=Y5+4flOAbtGhP7kdbZp1HEbMR9INRsRrpN0p15iCWgKQPboosNmDy2UpQVpjp6Gxag 2zbMLrq0o02JM3DBOvJdmi9vRpdd/Fi/OIv+46EXTXOtH4ZcT5/fa2vrwCsPFdmkiGrp t+TskS6oFLDphJsquOQlhfijsQFabXj6kez4ZOm/xGn+7zZT+rUev+uKYyO3mIYUdu3s hcs+QUmC0FH2Z1gEqRwcGVsN2eVaHvnWlgAej1aInI7JHS3ExBUlaGC3XsYpeWb1Nbd7 TBHhj2ReIoh3fznEjsA3eZvjwcnQoGGK/FSqr8LCr7dWKdAkF94hOj3Aa3l9h2jd+l18 9SFg== X-Forwarded-Encrypted: i=1; AHgh+RpCBNhy/PglCJi7JFff+qX3NnK+0mxMAaoIoPz3R3IeRNj01yA3zX5LufWkKPuRsRh99qpG8zI4rwjV5Ns=@vger.kernel.org X-Gm-Message-State: AOJu0YzqqfHs/3Pk6+BsOvvorAq29UxinXEcBXDYFtNWQjJwi66xbAHY Qh8M6WOsBBnKZYBWv2hMFAuAkJrPp/jDIUu/YjVdG/hX8wWwDmEL42Y4aE7tLCuBdbg= X-Gm-Gg: AfdE7cmCJc3IsdWxDx2TVyH6muhPYsgxFBApm9xyCKID3IOc2bc0W+ku5MHQ+iVZhBI VUWZAuNhhPLPxMdSUX3tSihKt++fE8zqQPXI9NQ4Lth3BVT/PO9Rf6jm9eepuoLq5Dk2aW32Smq +27DYJ7mWuvJ9+7g/nsg0fZ2m7pEVbs3EOLCm8Rz6IKj+GQZ7w1hcN+5YKLRuV+48opN93PhmW1 ieCvgsQX0pDmTwx7O/0fdi4d6ZOgOxgmD1ECINZLKQsdaTFQn07i/+avr2b5N1e/ah548MLSI31 BxtKeRUZdu/Wy/B4xQQZO7RRpiGXLx2ya5zfjpNptyzc7JJOamqNJDBuSaAECc3DkB8vPsMHM7x 6Ip7RsehDi54msJnPzpiEoLFmiRmmxXgjktyDajnpKTjQUfmkZnHmA7eYl7x1jYjsM4q85hjBAI ZYcSh4ZvvITkVIrT2h9kc3ucBvi4vUS9h3ZUbhjtbhscR5xjgYzp2C4svbCUxmC+PpKE4E465jE rb7Vwh8mHG7P0PW X-Received: by 2002:a05:6000:4691:b0:475:3a97:8e47 with SMTP id ffacd0b85a97d-47aaadc9ca9mr6202068f8f.29.1783322701442; Mon, 06 Jul 2026 00:25:01 -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.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jul 2026 00:25:01 -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 08/18] fs/ceph: remove i_truncate_mutex, use i_fragtree_mutex for both Date: Mon, 6 Jul 2026 09:24:39 +0200 Message-ID: <20260706072450.3920010-9-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 `i_fragtree_mutex` is only used for directories and `i_truncate_mutex` is only used for regular files. Since these two fields will never be both be used on any given object, let's merge them into one. (This is a minimal diff that defines a preprocessor macro, to avoid refactoring all code lines using these two mutexes.) This reduces the size of `struct ceph_inode_info` by 8 bytes. Signed-off-by: Max Kellermann --- fs/ceph/inode.c | 1 - fs/ceph/super.h | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index e79ba09f2cdf..1f65aa387008 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -677,7 +677,6 @@ struct inode *ceph_alloc_inode(struct super_block *sb) for (i = 0; i < CEPH_FILE_MODE_BITS; i++) ci->i_nr_by_mode[i] = 0; - mutex_init(&ci->i_truncate_mutex); ci->i_truncate_seq = 0; ci->i_truncate_size = 0; ci->i_truncate_pending = 0; diff --git a/fs/ceph/super.h b/fs/ceph/super.h index 05452bc7eac1..35399689f0c1 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h @@ -466,7 +466,11 @@ struct ceph_inode_info { unsigned long i_last_wr; int i_nr_by_mode[CEPH_FILE_MODE_BITS]; /* open file counts */ - struct mutex i_truncate_mutex; +/* since i_fragtree_mutex is only used for directories and + i_truncate_mutex is only used for regular files, we use the same + field for both */ +#define i_truncate_mutex i_fragtree_mutex + 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 */ -- 2.47.3