From nobody Fri Oct 3 21:09:49 2025 Received: from ssh248.corpemail.net (ssh248.corpemail.net [210.51.61.248]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A69AF2EAB98 for ; Mon, 25 Aug 2025 12:08:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.51.61.248 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756123687; cv=none; b=fYDDpZseRji6GucXf+RG8XZ7wltwSUFGYhW3U18PLytw1/PiubY/A1lHVEkmgs/gsxGXMz9WGcdSa+C4eS2gSlVPMzB7i16hKgar8nw3/2SyJa0l8/WLFes7AoAAk9b0yrJ7/dCZWBq7In4KnnvWNllLshoZl/7tj0a4BEMNj1A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756123687; c=relaxed/simple; bh=3skBRuwQGP4tnMw1c9oitFv5PUaUpDXrJMm8aRAaO1s=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=owiUBLFoAuccLCwlCA7svbhr9kYxm2K3rGpBUrAU85spEdYiVu7/qw7c93VvHBncFw8XwP1ehxnXVvcm2ZvitUsx/r7DqKvK/29MCjMCLmqeRZMR9kpkqtKsPN/P0aa6pWE5TJoDRfW6S7D4HIHhUcjE+dYOhgzIjAhcKSrbmSI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=inspur.com; spf=pass smtp.mailfrom=inspur.com; arc=none smtp.client-ip=210.51.61.248 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=inspur.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=inspur.com Received: from jtjnmail201610.home.langchao.com by ssh248.corpemail.net ((D)) with ASMTP (SSL) id 202508252006433278; Mon, 25 Aug 2025 20:06:43 +0800 Received: from localhost.localdomain (10.94.4.237) by jtjnmail201610.home.langchao.com (10.100.2.10) with Microsoft SMTP Server id 15.1.2507.57; Mon, 25 Aug 2025 20:06:45 +0800 From: Bo Liu To: , CC: , , Bo Liu Subject: [PATCH] erofs: Add support for FS_IOC_GETFSLABEL Date: Mon, 25 Aug 2025 08:06:17 -0400 Message-ID: <20250825120617.19746-1-liubo03@inspur.com> X-Mailer: git-send-email 2.18.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 tUid: 2025825200643879c5d1907785c46d1a62c5bb4ec3e08 X-Abuse-Reports-To: service@corp-email.com Abuse-Reports-To: service@corp-email.com X-Complaints-To: service@corp-email.com X-Report-Abuse-To: service@corp-email.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Bo Liu (OpenAnolis) Add support for reading to the erofs volume label from the FS_IOC_GETFSLABEL ioctls. Signed-off-by: Bo Liu (OpenAnolis) --- fs/erofs/Makefile | 2 +- fs/erofs/data.c | 4 ++++ fs/erofs/dir.c | 4 ++++ fs/erofs/inode.c | 2 +- fs/erofs/internal.h | 10 ++++++++++ fs/erofs/ioctl.c | 47 +++++++++++++++++++++++++++++++++++++++++++++ fs/erofs/super.c | 2 ++ fs/erofs/zdata.c | 11 +++++++++++ 8 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 fs/erofs/ioctl.c diff --git a/fs/erofs/Makefile b/fs/erofs/Makefile index 549abc424763..5be6cc4acc1c 100644 --- a/fs/erofs/Makefile +++ b/fs/erofs/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only =20 obj-$(CONFIG_EROFS_FS) +=3D erofs.o -erofs-objs :=3D super.o inode.o data.o namei.o dir.o sysfs.o +erofs-objs :=3D super.o inode.o data.o namei.o dir.o sysfs.o ioctl.o erofs-$(CONFIG_EROFS_FS_XATTR) +=3D xattr.o erofs-$(CONFIG_EROFS_FS_ZIP) +=3D decompressor.o zmap.o zdata.o zutil.o erofs-$(CONFIG_EROFS_FS_ZIP_LZMA) +=3D decompressor_lzma.o diff --git a/fs/erofs/data.c b/fs/erofs/data.c index 3b1ba571c728..8ca29962a3dd 100644 --- a/fs/erofs/data.c +++ b/fs/erofs/data.c @@ -475,6 +475,10 @@ static loff_t erofs_file_llseek(struct file *file, lof= f_t offset, int whence) const struct file_operations erofs_file_fops =3D { .llseek =3D erofs_file_llseek, .read_iter =3D erofs_file_read_iter, + .unlocked_ioctl =3D erofs_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl =3D erofs_compat_ioctl, +#endif .mmap_prepare =3D erofs_file_mmap_prepare, .get_unmapped_area =3D thp_get_unmapped_area, .splice_read =3D filemap_splice_read, diff --git a/fs/erofs/dir.c b/fs/erofs/dir.c index debf469ad6bd..32b4f5aa60c9 100644 --- a/fs/erofs/dir.c +++ b/fs/erofs/dir.c @@ -123,4 +123,8 @@ const struct file_operations erofs_dir_fops =3D { .llseek =3D generic_file_llseek, .read =3D generic_read_dir, .iterate_shared =3D erofs_readdir, + .unlocked_ioctl =3D erofs_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl =3D erofs_compat_ioctl, +#endif }; diff --git a/fs/erofs/inode.c b/fs/erofs/inode.c index 9a2f59721522..9248143e26df 100644 --- a/fs/erofs/inode.c +++ b/fs/erofs/inode.c @@ -214,7 +214,7 @@ static int erofs_fill_inode(struct inode *inode) case S_IFREG: inode->i_op =3D &erofs_generic_iops; if (erofs_inode_is_data_compressed(vi->datalayout)) - inode->i_fop =3D &generic_ro_fops; + inode->i_fop =3D &z_erofs_file_fops; else inode->i_fop =3D &erofs_file_fops; break; diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index 4ccc5f0ee8df..2f874b920c8b 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -32,6 +32,8 @@ __printf(2, 3) void _erofs_printk(struct super_block *sb,= const char *fmt, ...); #define DBG_BUGON(x) ((void)(x)) #endif /* !CONFIG_EROFS_FS_DEBUG */ =20 +#define EROFS_VOLUME_LABEL_LEN 16 + /* EROFS_SUPER_MAGIC_V1 to represent the whole file system */ #define EROFS_SUPER_MAGIC EROFS_SUPER_MAGIC_V1 =20 @@ -166,6 +168,9 @@ struct erofs_sb_info { struct erofs_domain *domain; char *fsid; char *domain_id; + + /* volume name */ + u8 volume_label[EROFS_VOLUME_LABEL_LEN]; }; =20 #define EROFS_SB(sb) ((struct erofs_sb_info *)(sb)->s_fs_info) @@ -404,6 +409,7 @@ extern const struct inode_operations erofs_dir_iops; =20 extern const struct file_operations erofs_file_fops; extern const struct file_operations erofs_dir_fops; +extern const struct file_operations z_erofs_file_fops; =20 extern const struct iomap_ops z_erofs_iomap_report_ops; =20 @@ -535,6 +541,10 @@ static inline struct bio *erofs_fscache_bio_alloc(stru= ct erofs_map_dev *mdev) { static inline void erofs_fscache_submit_bio(struct bio *bio) {} #endif =20 +long erofs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg); +long erofs_compat_ioctl(struct file *filp, unsigned int cmd, + unsigned long arg); + #define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */ =20 #endif /* __EROFS_INTERNAL_H */ diff --git a/fs/erofs/ioctl.c b/fs/erofs/ioctl.c new file mode 100644 index 000000000000..10bfd593225f --- /dev/null +++ b/fs/erofs/ioctl.c @@ -0,0 +1,47 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +#include +#include +#include + +#include "erofs_fs.h" +#include "internal.h" + +static int erofs_ioctl_get_volume_label(struct inode *inode, void __user *= arg) +{ + struct erofs_sb_info *sbi =3D EROFS_I_SB(inode); + size_t len; + int ret; + char label[EROFS_VOLUME_LABEL_LEN]; + + memcpy(label, sbi->volume_label, EROFS_VOLUME_LABEL_LEN); + + len =3D strnlen(label, EROFS_VOLUME_LABEL_LEN); + if (len =3D=3D EROFS_VOLUME_LABEL_LEN) + erofs_err(inode->i_sb, "label is too long, return the first %zu bytes", + --len); + + ret =3D copy_to_user(arg, label, len); + + return ret ? -EFAULT : 0; +} + +long erofs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) +{ + struct inode *inode =3D file_inode(filp); + void __user *argp =3D (void __user *)arg; + + switch (cmd) { + case FS_IOC_GETFSLABEL: + return erofs_ioctl_get_volume_label(inode, argp); + default: + return -ENOTTY; + } +} + +#ifdef CONFIG_COMPAT +long erofs_compat_ioctl(struct file *filp, unsigned int cmd, + unsigned long arg) +{ + return erofs_ioctl(filp, cmd, (unsigned long)compat_ptr(arg)); +} +#endif diff --git a/fs/erofs/super.c b/fs/erofs/super.c index 1b529ace4db0..e6ad6cf4ba82 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -343,6 +343,8 @@ static int erofs_read_superblock(struct super_block *sb) sbi->fixed_nsec =3D le32_to_cpu(dsb->fixed_nsec); super_set_uuid(sb, (void *)dsb->uuid, sizeof(dsb->uuid)); =20 + memcpy(sbi->volume_label, dsb->volume_name, EROFS_VOLUME_LABEL_LEN); + /* parse on-disk compression configurations */ ret =3D z_erofs_parse_cfgs(sb, dsb); if (ret < 0) diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c index 2d73297003d2..b612bf7b2f08 100644 --- a/fs/erofs/zdata.c +++ b/fs/erofs/zdata.c @@ -1931,3 +1931,14 @@ const struct address_space_operations z_erofs_aops = =3D { .read_folio =3D z_erofs_read_folio, .readahead =3D z_erofs_readahead, }; + +const struct file_operations z_erofs_file_fops =3D { + .llseek =3D generic_file_llseek, + .read_iter =3D generic_file_read_iter, + .unlocked_ioctl =3D erofs_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl =3D erofs_compat_ioctl, +#endif + .mmap =3D generic_file_readonly_mmap, + .splice_read =3D filemap_splice_read, +}; --=20 2.31.1