| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <7eb749216aaf43c8bac99fb1755d032f@inspur.com>
Date: Mon, 22 Sep 2025 09:28:17 +0000
From: Bo Liu (刘波)-浪潮信息
<liubo03@...pur.com>
To: "hsiangkao@...ux.alibaba.com" <hsiangkao@...ux.alibaba.com>,
"xiang@...nel.org" <xiang@...nel.org>, "chao@...nel.org" <chao@...nel.org>
CC: "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"linux-erofs@...ts.ozlabs.org" <linux-erofs@...ts.ozlabs.org>
Subject: Re: [PATCH] erofs: Add support for FS_IOC_GETFSLABEL
>-----Original Message-----
>From: Gao Xiang <hsiangkao@...ux.alibaba.com>
>Sent: Monday, September 22, 2025 9:49 AM
>To: Bo Liu (刘波)-浪潮信息 <liubo03@...pur.com>; xiang@...nel.org;
>chao@...nel.org
>Cc: linux-kernel@...r.kernel.org; linux-erofs@...ts.ozlabs.org
>Subject: Re: [PATCH] erofs: Add support for FS_IOC_GETFSLABEL
>
>
>
>On 2025/9/20 14:04, Bo Liu wrote:
>> From: Bo Liu (OpenAnolis) <liubo03@...pur.com>
>>
>> Add support for reading to the erofs volume label from the
>> FS_IOC_GETFSLABEL ioctls.
>>
>> Signed-off-by: Bo Liu (OpenAnolis) <liubo03@...pur.com>
>> ---
>>
>> v1:
>>
>https://lore.kernel.org/linux-erofs/63904ade56634923ba734dcdab3c45d0@i
>> nspur.com/T/#t
>> v2:
>> https://lore.kernel.org/linux-erofs/20250826103926.4424-1-liubo03@insp
>> ur.com/T/#u
>>
>> Changes since v2:
>> - remove unnecessary code
>>
>> fs/erofs/Makefile | 2 +-
>> fs/erofs/data.c | 4 ++++
>> fs/erofs/dir.c | 4 ++++
>> fs/erofs/inode.c | 5 +----
>> fs/erofs/internal.h | 7 +++++++
>> fs/erofs/ioctl.c | 41
>+++++++++++++++++++++++++++++++++++++++++
>> fs/erofs/super.c | 8 ++++++++
>> 7 files changed, 66 insertions(+), 5 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
>>
>> obj-$(CONFIG_EROFS_FS) += erofs.o
>> -erofs-objs := super.o inode.o data.o namei.o dir.o sysfs.o
>> +erofs-objs := super.o inode.o data.o namei.o dir.o sysfs.o ioctl.o
>> erofs-$(CONFIG_EROFS_FS_XATTR) += xattr.o
>> erofs-$(CONFIG_EROFS_FS_ZIP) += decompressor.o zmap.o zdata.o zutil.o
>> erofs-$(CONFIG_EROFS_FS_ZIP_LZMA) += 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, loff_t
>offset, int whence)
>> const struct file_operations erofs_file_fops = {
>> .llseek = erofs_file_llseek,
>> .read_iter = erofs_file_read_iter,
>> + .unlocked_ioctl = erofs_ioctl,
>> +#ifdef CONFIG_COMPAT
>> + .compat_ioctl = erofs_compat_ioctl,
>> +#endif
>> .mmap_prepare = erofs_file_mmap_prepare,
>> .get_unmapped_area = thp_get_unmapped_area,
>> .splice_read = 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 = {
>> .llseek = generic_file_llseek,
>> .read = generic_read_dir,
>> .iterate_shared = erofs_readdir,
>> + .unlocked_ioctl = erofs_ioctl,
>> +#ifdef CONFIG_COMPAT
>> + .compat_ioctl = erofs_compat_ioctl,
>> +#endif
>> };
>> diff --git a/fs/erofs/inode.c b/fs/erofs/inode.c index
>> 9a2f59721522..a7ec17eec4b2 100644
>> --- a/fs/erofs/inode.c
>> +++ b/fs/erofs/inode.c
>> @@ -213,10 +213,7 @@ static int erofs_fill_inode(struct inode *inode)
>> switch (inode->i_mode & S_IFMT) {
>> case S_IFREG:
>> inode->i_op = &erofs_generic_iops;
>> - if (erofs_inode_is_data_compressed(vi->datalayout))
>> - inode->i_fop = &generic_ro_fops;
>> - else
>> - inode->i_fop = &erofs_file_fops;
>> + inode->i_fop = &erofs_file_fops;
>> break;
>> case S_IFDIR:
>> inode->i_op = &erofs_dir_iops;
>> diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index
>> 4ccc5f0ee8df..311346a017a7 100644
>> --- a/fs/erofs/internal.h
>> +++ b/fs/erofs/internal.h
>> @@ -166,6 +166,9 @@ struct erofs_sb_info {
>> struct erofs_domain *domain;
>> char *fsid;
>> char *domain_id;
>> +
>> + /* volume name */
>
>The comment is useless, just drop this line.
>
>> + char *volume_name;
>> };
>>
>> #define EROFS_SB(sb) ((struct erofs_sb_info *)(sb)->s_fs_info) @@
>> -535,6 +538,10 @@ static inline struct bio *erofs_fscache_bio_alloc(struct
>erofs_map_dev *mdev) {
>> static inline void erofs_fscache_submit_bio(struct bio *bio) {}
>> #endif
>>
>> +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 */
>>
>> #endif /* __EROFS_INTERNAL_H */
>> diff --git a/fs/erofs/ioctl.c b/fs/erofs/ioctl.c new file mode 100644
>> index 000000000000..fbcbf820c4d7
>> --- /dev/null
>> +++ b/fs/erofs/ioctl.c
>> @@ -0,0 +1,41 @@
>> +// SPDX-License-Identifier: GPL-2.0-or-later #include <linux/fs.h>
>> +#include <linux/compat.h> #include <linux/file.h>
>> +
>> +#include "internal.h"
>> +
>> +static int erofs_ioctl_get_volume_label(struct inode *inode, void
>> +__user *arg)
>
>Can we just move these functions into inode.c instead?
>
>Since there is no need to introduce a new file just for a few new lines.
>
>Otherwise it looks good to me.
>
>Thanks,
>Gao Xiang
Thanks for your comments.
I will send the next version of the patch later.
Thanks,
Bo Liu
Download attachment "smime.p7s" of type "application/pkcs7-signature" (3925 bytes)
Powered by blists - more mailing lists