projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
[powerpc.git]
/
fs
/
configfs
/
mount.c
diff --git
a/fs/configfs/mount.c
b/fs/configfs/mount.c
index
ed67852
..
b00d962
100644
(file)
--- a/
fs/configfs/mount.c
+++ b/
fs/configfs/mount.c
@@
-41,7
+41,7
@@
struct super_block * configfs_sb = NULL;
struct kmem_cache *configfs_dir_cachep;
static int configfs_mnt_count = 0;
struct kmem_cache *configfs_dir_cachep;
static int configfs_mnt_count = 0;
-static struct super_operations configfs_ops = {
+static
const
struct super_operations configfs_ops = {
.statfs = simple_statfs,
.drop_inode = generic_delete_inode,
};
.statfs = simple_statfs,
.drop_inode = generic_delete_inode,
};
@@
-140,7
+140,7
@@
static int __init configfs_init(void)
if (!configfs_dir_cachep)
goto out;
if (!configfs_dir_cachep)
goto out;
- k
set
_set_kset_s(&config_subsys, kernel_subsys);
+ k
obj
_set_kset_s(&config_subsys, kernel_subsys);
err = subsystem_register(&config_subsys);
if (err) {
kmem_cache_destroy(configfs_dir_cachep);
err = subsystem_register(&config_subsys);
if (err) {
kmem_cache_destroy(configfs_dir_cachep);