From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (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 5C745436BF7 for ; Mon, 6 Jul 2026 18:22:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783362179; cv=none; b=SX3Enk3TlZXHqX7feSz9eUoOiD3ipo5UeWzJQX8jyv4t3o+VzgC5zx+6+09Db73qrcKP6xbGZHBruIQ/ue/WZsOus1Lle2QlR5atCaLOGVEPLEKwFF0tS3tdPcWMnJEwIhv5JPOFZVxbRKmGt07xltcpxvPRX7vD6qScwaw8L+M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783362179; c=relaxed/simple; bh=RdWF90BX9xb4zylu5tEjy0IlcZeHBvXmpg6leRW7Whk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PcUoOBNH7SZNYTRTcWVID62rGZV6Xex9GrPvJZaFgCCD8O/5TK388UOft/UKFbzjDTcoJQvqMoeHgqpWdV+5oN4RDmog+Eplfk3p//rd8POMlr5Da2wSKJp9n39gfb+KrTvD1lCDK9HcViEvSUj9Zimro24IS/r7B+BaAOlg2yU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ffspohrF; arc=none smtp.client-ip=209.85.216.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ffspohrF" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-37cab825ec9so3344591a91.1 for ; Mon, 06 Jul 2026 11:22:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783362176; x=1783966976; 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=CswQuIBE063T4skhHwF0cyRKDPNNtYcirO22wWu67N8=; b=ffspohrFweoSdhkz8z1TJUtWxpq1wxEbo2p4dNuWazoGHrXqUR0NZ4KM3QZqrm1HxI 6ijTNaVQSVzso83q16eKdrwnk10SlRssD+YCOYIn6wpxKnj5A43O71enBYPxZ7KUjeXB HW4p6uSvq9fK4qoJMJjTNoGHx6Pcg6UvBUlRRkTeYfUXECGeXcTH2lHzwStXZP2WAWzX TPoYHa0KRf7Z2ZYeKOjySLc9md+3hQ+hayolg3ZaV5eOcoPjHPZT9UR05IcvWW97JSac W58Ud1ZK8spyY0oqwosWCZuBFOMDzfccJysU6ecDc/JAK49ZDQhua6WKqrgsfx9tNz0m Ri/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783362176; x=1783966976; 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=CswQuIBE063T4skhHwF0cyRKDPNNtYcirO22wWu67N8=; b=JOxvwbdbrMrGskAk5grfy7D9mJ6O7H5huDvGOWwLA3pfuONbn12G0xbqgmpsIkqham Mutcyg/ubh4tJKsiJmar7I3a5PXRBVJPnxJE3wYMio4DAX3LCnNhb4+mhmt4lv7WrRix qwWdiE2HDFQC99RgKDaPlZyaWZzf7ZQVeLMsZjZofQU2PAb+3fs3FaFJpNHHj6L929/W NyT9YIQ0+H75FWSNeR8YBEt8g0agp7Qz7SLH2WJtVw3B2HD5msx/XG/PbiDRUCs56qdR xzNEP4ex+UvAQ2xgYxrc2x+QW+4aAwPn6N2rqPGKqNL2MNPodEjOhZA8j+o1zD1toYGt kJxg== X-Gm-Message-State: AOJu0YwyoIBvTfpf3RZZI/pQftbnt9WcoiLxQ1ZUaBBJ2OoDAAj2rwkV s/9jO2DBg7v5wmVeaCX4TB570tvtueJk6RtTMYAQnsN56AB0Ud6C5bgLlm9k+Q== X-Gm-Gg: AfdE7cn//yyRVQ1+dSgBUFR230N6rEObuaZrj1iBkuvWWiV0yVAXsDjR/iap2wUdrsT iSkFDZctg6rbWk2aQobowIOAFAVoGkNGdedIxIK4IjuhVRKodw7ObJ4ggSQXWTgi5jszbEmZ6Ht 1mYANZ6sVudoEU2scUA5PUeD43ay7gvZaCGNrubbRS2zEI7BaKLSlaadfngBKThXJ2FV4VwV2Lx 5k/MMrcwjn5jRlU8NglEt4kqru0ZBaLsifE1v5UOUavgi+Jy0GhjNKdSpgeMUWYIWkNocXDySpH ITpaLcUKlo9qvP1BOPcERymmVaSpHWeek0B+pf1HF2d/BXXuKqwT7YDPQ+bmvAvaWvHf9zAecL6 Bs+nhJrOPI4y6efw406ydyeDw3SXy7dL7kgt1Ta2v65PorLC7qMJRAz09SFEl2EI= X-Received: by 2002:a17:90b:1ccf:b0:383:5a16:bd79 with SMTP id 98e67ed59e1d1-38758a361cbmr1662472a91.22.1783362175541; Mon, 06 Jul 2026 11:22:55 -0700 (PDT) Received: from nineveh.sos.local ([131.191.24.68]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-387a83fb23csm21238a91.0.2026.07.06.11.22.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jul 2026 11:22:55 -0700 (PDT) From: Jeremy Bingham To: linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, brauner@kernel.org, jkoolstra@xs4all.nl, jack@suse.cz, Jeremy Bingham Subject: [PATCH 1/2] minix: define constants for dirsize and namelen Date: Mon, 6 Jul 2026 11:22:43 -0700 Message-ID: <7d62598a8be99c6218d05bfca56bc37f1e634a49.1783360491.git.jbingham@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The different versions of the minix fs have different values for directory size and name length. Versions 1 and 2 each have two possible values for each of those, while version 3 has one set of values for each. Add defines for all of these to minix.h so we don't need to set those values as magic numbers in minix_fill_super() in inode.c Before: sbi->s_dirsize = 16; After: sbi->s_dirsize = MINIX_V1_DIRSIZE; There are no functional changes with this patch. Signed-off-by: Jeremy Bingham --- fs/minix/inode.c | 20 ++++++++++---------- fs/minix/minix.h | 23 ++++++++++++++++++++++- 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/fs/minix/inode.c b/fs/minix/inode.c index c30cc590698d..95fa8371e4ea 100644 --- a/fs/minix/inode.c +++ b/fs/minix/inode.c @@ -258,25 +258,25 @@ static int minix_fill_super(struct super_block *s, struct fs_context *fc) s->s_magic = ms->s_magic; if (s->s_magic == MINIX_SUPER_MAGIC) { sbi->s_version = MINIX_V1; - sbi->s_dirsize = 16; - sbi->s_namelen = 14; + sbi->s_dirsize = MINIX_V1_DIRSIZE; + sbi->s_namelen = MINIX_V1_NAMELEN; s->s_max_links = MINIX_LINK_MAX; } else if (s->s_magic == MINIX_SUPER_MAGIC2) { sbi->s_version = MINIX_V1; - sbi->s_dirsize = 32; - sbi->s_namelen = 30; + sbi->s_dirsize = MINIX_V1_DIRSIZE2; + sbi->s_namelen = MINIX_V1_NAMELEN2; s->s_max_links = MINIX_LINK_MAX; } else if (s->s_magic == MINIX2_SUPER_MAGIC) { sbi->s_version = MINIX_V2; sbi->s_nzones = ms->s_zones; - sbi->s_dirsize = 16; - sbi->s_namelen = 14; + sbi->s_dirsize = MINIX_V2_DIRSIZE; + sbi->s_namelen = MINIX_V2_NAMELEN; s->s_max_links = MINIX2_LINK_MAX; } else if (s->s_magic == MINIX2_SUPER_MAGIC2) { sbi->s_version = MINIX_V2; sbi->s_nzones = ms->s_zones; - sbi->s_dirsize = 32; - sbi->s_namelen = 30; + sbi->s_dirsize = MINIX_V2_DIRSIZE2; + sbi->s_namelen = MINIX_V2_NAMELEN2; s->s_max_links = MINIX2_LINK_MAX; } else if ( *(__u16 *)(bh->b_data + 24) == MINIX3_SUPER_MAGIC) { m3s = (struct minix3_super_block *) bh->b_data; @@ -288,8 +288,8 @@ static int minix_fill_super(struct super_block *s, struct fs_context *fc) s->s_maxbytes = m3s->s_max_size; sbi->s_ninodes = m3s->s_ninodes; sbi->s_nzones = m3s->s_zones; - sbi->s_dirsize = 64; - sbi->s_namelen = 60; + sbi->s_dirsize = MINIX_V3_DIRSIZE; + sbi->s_namelen = MINIX_V3_NAMELEN; sbi->s_version = MINIX_V3; sbi->s_mount_state = MINIX_VALID_FS; if (!sb_set_blocksize(s, m3s->s_blocksize)) diff --git a/fs/minix/minix.h b/fs/minix/minix.h index f2025c9b5825..972a71c5b481 100644 --- a/fs/minix/minix.h +++ b/fs/minix/minix.h @@ -11,6 +11,27 @@ #define MINIX_V2 0x0002 /* minix V2 fs */ #define MINIX_V3 0x0003 /* minix V3 fs */ +/* Define version and sub-version specific values for dirsize and name length. + * These are not as clear-cut as having different values for versions 1, 2, and + * 3, unfortunately, but rather there two possible values for each for versions + * 1 and 2 and one possible set of values for version 3. + * + * These have separate defines for each subversion value for versions 1 and 2, + * though; even though they duplicate each other, it will be more clear to have + * them separate than trying to come up with a name that encompasses both + * versions yet not be totally confusing. + */ +#define MINIX_V1_DIRSIZE 16 +#define MINIX_V1_NAMELEN 14 +#define MINIX_V1_DIRSIZE2 32 +#define MINIX_V1_NAMELEN2 30 +#define MINIX_V2_DIRSIZE 16 +#define MINIX_V2_NAMELEN 14 +#define MINIX_V2_DIRSIZE2 32 +#define MINIX_V2_NAMELEN2 30 +#define MINIX_V3_DIRSIZE 64 +#define MINIX_V3_NAMELEN 60 + /* * minix fs inode data in memory */ -- 2.47.3