nilfs2-add-support-for-fs_ioc_getfslabel.patch removed from -mm tree
The quilt patch titled
Subject: nilfs2: add support for FS_IOC_GETFSLABEL
has been removed from the -mm tree. Its filename was
nilfs2-add-support-for-fs_ioc_getfslabel.patch
This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Ryusuke Konishi <[email protected]>
Subject: nilfs2: add support for FS_IOC_GETFSLABEL
Date: Thu, 15 Aug 2024 16:44:07 +0900
Implement support for FS_IOC_GETFSLABEL ioctl to read filesystem label.
Signed-off-by Ryusuke Konishi <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
fs/nilfs2/ioctl.c | 27 +++++++++++++++++++++++++++ fs/nilfs2/nilfs.h | 12 ++++++++++++ 2 files changed, 39 insertions(+)
fs/nilfs2/ioctl.c renamed from fs/nilfs2/ioctl.c~nilfs2-add-support-for-fs_ioc_getfslabel +27 -0
@@ -17,6 +17,7 @@#include <linux/mount.h> /* mnt_want_write_file(), mnt_drop_write_file() */ #include <linux/buffer_head.h> #include <linux/fileattr.h> +#include <linux/string.h> #include "nilfs.h" #include "segment.h" #include "bmap.h"
@@ -1266,6 +1267,29 @@ out:return ret; } +/** +* nilfs_ioctl_get_fslabel - get the volume name of the file system +* @sb: super block instance +* @argp: pointer to userspace memory where the volume name should be stored +* +* Return: 0 on success, %-EFAULT if copying to userspace memory fails. +*/ +static int nilfs_ioctl_get_fslabel (struct super_block *sb,void __user *argp) +{ +struct the_nilfs *nilfs = sb->s_fs_info; +char label[NILFS_MAX_VOLUME_NAME +1 ]; + +BUILD_BUG_ON (NILFS_MAX_VOLUME_NAME >=FSLABEL_MAX ); + +down_read (&nilfs->ns_sem); +memtostr_pad (label, nilfs->ns_sbp[0 ]->s_volume_name); +up_read (&nilfs->ns_sem); + +if (copy_to_user (argp, label,sizeof (label))) +return -EFAULT ; +return 0 ; +} +long nilfs_ioctl (struct file *filp,unsigned int cmd,unsigned long arg) {struct inode *inode =file_inode (filp);
@@ -1308,6 +1332,8 @@ long nilfs_ioctl(struct file *filp, unsireturn nilfs_ioctl_set_alloc_range (inode, argp);case FITRIM :return nilfs_ioctl_trim_fs (inode, argp); +case FS_IOC_GETFSLABEL : +return nilfs_ioctl_get_fslabel (inode->i_sb, argp);default :return -ENOTTY ; }
@@ -1334,6 +1360,7 @@ long nilfs_compat_ioctl(struct file *filcase NILFS_IOCTL_RESIZE :case NILFS_IOCTL_SET_ALLOC_RANGE :case FITRIM : +case FS_IOC_GETFSLABEL :break ;default :return -ENOIOCTLCMD ;
fs/nilfs2/nilfs.h renamed from fs/nilfs2/nilfs.h~nilfs2-add-support-for-fs_ioc_getfslabel +12 -0
@@ -103,6 +103,18 @@ enum { NILFS_SB_COMMIT_ALL /* Commit both super blocks */ }; +/** +* define NILFS_MAX_VOLUME_NAME - maximum number of characters (bytes) in a +* file system volume name +* +* Defined by the size of the volume name field in the on-disk superblocks. +* This volume name does not include the terminating NULL byte if the string +* length matches the field size, so use (NILFS_MAX_VOLUME_NAME + 1) for the +* size of the buffer that requires a NULL byte termination. +*/ +#define NILFS_MAX_VOLUME_NAME \ + sizeof_field(struct nilfs_super_block, s_volume_name) +/* * Macros to check inode numbers */
_
Patches currently in -mm which might be from [email protected] are