sysfs, kernfs: make sysfs_super_info->ns const (51a35e9f) · Commits · 戴 / test

Add const qualifier to sysfs_super_info->ns so that it's consistent with other namespace tag usages in sysfs. Because kobject doesn't use const qualifier for namespace tags, this ends up requiring an explicit cast to drop const qualifier in free_sysfs_super_info(). Signed-off-by:

Tejun Heo <tj@kernel.org> Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

fs/sysfs/mount.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -92,7 +92,7 @@ static int sysfs_set_super(struct super_block sb, void data)

		static void free_sysfs_super_info(struct sysfs_super_info *info)
		{
		kobj_ns_drop(KOBJ_NS_TYPE_NET, info->ns);
		kobj_ns_drop(KOBJ_NS_TYPE_NET, (void *)info->ns);
		kfree(info);
		}

fs/sysfs/sysfs.h

+7 −7

Original line number	Diff line number	Diff line
		@@ -18,14 +18,14 @@
		* mount.c
		*/

		struct sysfs_super_info {
		/*
		* Each sb is associated with one namespace tag, currently the network
		* namespace of the task which mounted this sysfs instance. If multiple
		* tags become necessary, make the following an array and compare
		* sysfs_dirent tag against every entry.
		*/
		struct sysfs_super_info {
		void *ns;
		const void *ns;
		};
		#define sysfs_info(SB) ((struct sysfs_super_info *)(SB->s_fs_info))
		extern struct sysfs_dirent sysfs_root;

Admin message