From nobody Thu Apr 2 17:16:01 2026 Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) (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 67B7D2FF148 for ; Tue, 17 Feb 2026 23:08:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771369736; cv=none; b=PiakjBqrNgOwDl4AolR4Z7HXErxu451QRXes40UBP0vKR8pmemeViYIXv3/d59ZvvQY3q7U9IRNufNwtkhucPFWj1SD3KWvRigFstFGOIpFzMZc1nAerOdDAQded9UqYbGXlYjri3pNtAOAU002fNKeJciDhoQE7A4/qhlWKRgs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771369736; c=relaxed/simple; bh=bpyKdwxEgiGS0ibektv1g5DWi5ZbckLP8xYHNlvIEmE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tyvsNHU51b3ym8I8IrgnvP7a7LncaBE10BIOv64qEMWHQvBjSRwRkvYhqXQceJ7afDiCcDjl8/weFQRrzTvqDztmwea/pjVy85KsJPmFzvbsO1HNyR+yU+80U0KVIy05dvrdIURPwabey3nNcHkId4MQwNCwbTtZ/YxcoXYHuP4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=zetier.com; spf=pass smtp.mailfrom=zetier.com; dkim=pass (2048-bit key) header.d=zetier.com header.i=@zetier.com header.b=UQvxiKrI; arc=none smtp.client-ip=209.85.219.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=zetier.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=zetier.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=zetier.com header.i=@zetier.com header.b="UQvxiKrI" Received: by mail-qv1-f54.google.com with SMTP id 6a1803df08f44-89549b2f538so5878096d6.2 for ; Tue, 17 Feb 2026 15:08:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zetier.com; s=gm; t=1771369734; x=1771974534; 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=67x0rmIMjc1SgKva+b4U06wk0ssnpT3jAfZBeoUNrj0=; b=UQvxiKrIyfeXPaHjdc4EPAg1rhTdynhZRhj2AeuMaf6fzevtiTPm8LL28BuJGJVIYd NcsS6aSfCBG3Sdqmr92xNgLOgFn8LIgviATv74z3jCGJNe9nA8hkoy2qjx5vLzPl2U3L UZfa9hTsJdbDUmjwAspuZONqYyPryZ+V3212+wklyMEDQikkrlXPGqYzKpD78dVTMAFq vT1QNZiJjwXW91fHIi4OMqNcIjcKVprSK9ZTiYpN/O3+fJg9y+8i+m+MlASDMlwPUbe6 TSZ9nHU+tv9wAzS6BKNdNiv7gDGko4NQIl9H0C+CXt4RMVq0rXXjk9plAQnysj0DW+xn DeWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771369734; x=1771974534; 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=67x0rmIMjc1SgKva+b4U06wk0ssnpT3jAfZBeoUNrj0=; b=vE+uIcJ0Z/czmMDw+h3I0INiRNhVHp7kWKq8jqJqVgT8POneQo1AlCB9oA/Ptv6I1V 9TBO530Mf1idw1pDCaz2AMk9AV5nhrOTJYgt3PBFMfdGVRqxeGB6Jug+KgcYjKXIf+An ARqFBXAPKZ2Uv2Gm3s9EKbjw5v7bQgqNtvJe819ltGCCs0O7mOpNhySCEq6mGXr3j/Vq uIG8be7U+wd97sQCnKrlk8+O5New2r3fF8KutLH0FiWkxgmCAtBNOi0rbij7XSH2D+Md xbelhtYZfacw/CsFszUlOU/hRGU4OPi7U+w8kOBdCAThHWJoCdTjcQE9JO+j+OwCqwDI xUiw== X-Forwarded-Encrypted: i=1; AJvYcCXOrNySwZisyTvCd0E7pz432jQhBJ0ypFMg6SP16RDRwhFKumvkLhLUw09u1WImoEqhgg+0HxodHx2dV1g=@vger.kernel.org X-Gm-Message-State: AOJu0YyAUmRcySv7dfBmrurD61zAK+vvAChPDu+/t1WegcQzmEzO9WJW e2DaALxFugHukSK023SZ4z7pz9te1zXJa6Imb7GPiwfQJ7CQiwXlhmHXTAFE3pXjG2Y= X-Gm-Gg: AZuq6aI2eMXE0slV6LIgYKN5q77eZHkVLJQ1cUd6128tzUHcrlsITCZhkuQifrWYgvw o4P03C1HQoCcLjBH2ra8CHpFQpFLb0JK7xdv0x7HqmrKaHKaceuNleUbZmdIp7JajO5OM/bfmth 6wTGmXKrbZUIBLlASPK19lPC0F2XlOkDDse/qKgnkOUeepU19vvLUV/21egDFc+SzJt5PvR/INU muwui5kwM1VTp6Q8SQZHy0MetC1yj4R/KQHv5eQASyeT+I2jaHcFWPmCVuE6zD05fN1tRKfUcUl HF7tIe0jeR6ASkP21HQqKdCynOCK+HSpxlRsVlf6aKemsGlBDH6LnxLKMrievs+DKJivGXyDXi9 jAS0g/gXxLcxV2PsCtvV36gziaZ3rN+RYueMngBRmgaSqJnY8hXnanDnmRzgDOtLLB/IVrdZEAW 3qwUub+KlUeC1WKdWSk23g1oETgeeFhFf/5CvzMq0la+/rjDj2Yw1naS/Rvfx8Y9AVa3m5fQEhw F5p X-Received: by 2002:ad4:5d6b:0:b0:895:4cc2:8bfe with SMTP id 6a1803df08f44-8974049b5ffmr182540386d6.48.1771369734196; Tue, 17 Feb 2026 15:08:54 -0800 (PST) Received: from warpstation.incus (243.69.21.34.bc.googleusercontent.com. [34.21.69.243]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8971cc7f82csm175513186d6.4.2026.02.17.15.08.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Feb 2026 15:08:53 -0800 (PST) From: Ethan Ferguson To: hirofumi@mail.parknet.co.jp Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Ethan Ferguson Subject: [PATCH v2 1/2] fat: Add FS_IOC_GETFSLABEL ioctl Date: Tue, 17 Feb 2026 18:06:27 -0500 Message-ID: <20260217230628.719475-2-ethan.ferguson@zetier.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260217230628.719475-1-ethan.ferguson@zetier.com> References: <20260217230628.719475-1-ethan.ferguson@zetier.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add support for reading the volume label of a FAT filesystem via the FS_IOC_GETFSLABEL ioctl. Signed-off-by: Ethan Ferguson --- fs/fat/fat.h | 1 + fs/fat/file.c | 16 ++++++++++++++++ fs/fat/inode.c | 11 +++++++++-- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/fs/fat/fat.h b/fs/fat/fat.h index 0d269dba897b..4350c00dba34 100644 --- a/fs/fat/fat.h +++ b/fs/fat/fat.h @@ -89,6 +89,7 @@ struct msdos_sb_info { int dir_per_block; /* dir entries per block */ int dir_per_block_bits; /* log2(dir_per_block) */ unsigned int vol_id; /*volume ID*/ + char vol_label[MSDOS_NAME]; /* volume label */ =20 int fatent_shift; const struct fatent_operations *fatent_ops; diff --git a/fs/fat/file.c b/fs/fat/file.c index 124d9c5431c8..029b1750d1ec 100644 --- a/fs/fat/file.c +++ b/fs/fat/file.c @@ -153,6 +153,20 @@ static int fat_ioctl_fitrim(struct inode *inode, unsig= ned long arg) return 0; } =20 +static int fat_ioctl_get_volume_label(struct super_block *sb, char __user = *arg) +{ + struct msdos_sb_info *sbi =3D MSDOS_SB(sb); + int ret; + + mutex_lock(&sbi->s_lock); + ret =3D copy_to_user(arg, sbi->vol_label, MSDOS_NAME); + mutex_unlock(&sbi->s_lock); + if (ret) + return -EFAULT; + + return 0; +} + long fat_generic_ioctl(struct file *filp, unsigned int cmd, unsigned long = arg) { struct inode *inode =3D file_inode(filp); @@ -165,6 +179,8 @@ long fat_generic_ioctl(struct file *filp, unsigned int = cmd, unsigned long arg) return fat_ioctl_set_attributes(filp, user_attr); case FAT_IOCTL_GET_VOLUME_ID: return fat_ioctl_get_volume_id(inode, user_attr); + case FS_IOC_GETFSLABEL: + return fat_ioctl_get_volume_label(inode->i_sb, (char __user *) arg); case FITRIM: return fat_ioctl_fitrim(inode, arg); default: diff --git a/fs/fat/inode.c b/fs/fat/inode.c index 59fa90617b5b..6f9a8cc1ad2a 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c @@ -53,12 +53,14 @@ struct fat_bios_param_block { =20 u8 fat16_state; u32 fat16_vol_id; + u8 fat16_vol_label[MSDOS_NAME]; =20 u32 fat32_length; u32 fat32_root_cluster; u16 fat32_info_sector; u8 fat32_state; u32 fat32_vol_id; + u8 fat32_vol_label[MSDOS_NAME]; }; =20 static int fat_default_codepage =3D CONFIG_FAT_DEFAULT_CODEPAGE; @@ -1406,12 +1408,14 @@ static int fat_read_bpb(struct super_block *sb, str= uct fat_boot_sector *b, =20 bpb->fat16_state =3D b->fat16.state; bpb->fat16_vol_id =3D get_unaligned_le32(b->fat16.vol_id); + memcpy(bpb->fat16_vol_label, b->fat16.vol_label, MSDOS_NAME); =20 bpb->fat32_length =3D le32_to_cpu(b->fat32.length); bpb->fat32_root_cluster =3D le32_to_cpu(b->fat32.root_cluster); bpb->fat32_info_sector =3D le16_to_cpu(b->fat32.info_sector); bpb->fat32_state =3D b->fat32.state; bpb->fat32_vol_id =3D get_unaligned_le32(b->fat32.vol_id); + memcpy(bpb->fat32_vol_label, b->fat32.vol_label, MSDOS_NAME); =20 /* Validate this looks like a FAT filesystem BPB */ if (!bpb->fat_reserved) { @@ -1708,10 +1712,13 @@ int fat_fill_super(struct super_block *sb, struct f= s_context *fc, } =20 /* interpret volume ID as a little endian 32 bit integer */ - if (is_fat32(sbi)) + if (is_fat32(sbi)) { sbi->vol_id =3D bpb.fat32_vol_id; - else /* fat 16 or 12 */ + memcpy(sbi->vol_label, bpb.fat32_vol_label, MSDOS_NAME); + } else { /* fat 16 or 12 */ sbi->vol_id =3D bpb.fat16_vol_id; + memcpy(sbi->vol_label, bpb.fat16_vol_label, MSDOS_NAME); + } =20 __le32 vol_id_le =3D cpu_to_le32(sbi->vol_id); super_set_uuid(sb, (void *) &vol_id_le, sizeof(vol_id_le)); --=20 2.43.0