From c156b35f4ee15da27bbb7caa3deda5b128b81d75 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Thu, 28 Nov 2013 14:54:37 -0500 Subject: [PATCH] sysfs, kernfs: make sysfs_super_info->ns const 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 Signed-off-by: Greg Kroah-Hartman --- fs/sysfs/mount.c | 2 +- fs/sysfs/sysfs.h | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c index 21070c286e3f0..fcbe5e80aeeb2 100644 --- a/fs/sysfs/mount.c +++ b/fs/sysfs/mount.c @@ -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); } diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h index 6d0dcead2d6a8..ce97907e2894d 100644 --- a/fs/sysfs/sysfs.h +++ b/fs/sysfs/sysfs.h @@ -18,14 +18,14 @@ * mount.c */ -/* - * 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; + /* + * 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. + */ + const void *ns; }; #define sysfs_info(SB) ((struct sysfs_super_info *)(SB->s_fs_info)) extern struct sysfs_dirent sysfs_root; -- 2.39.5