Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[mv-sheeva.git] / fs / configfs / mount.c

diff --git a/fs/configfs/mount.c b/fs/configfs/mount.c
index 94dab7bdd8518beef6528359ea178a1a6877b0d7..871b0cb618399223e3e500cae1a46b54c42475b9 100644 (file)
--- a/fs/configfs/mount.c
+++ b/fs/configfs/mount.c
@@ -38,10 +38,10 @@
 
 struct vfsmount * configfs_mount = NULL;
 struct super_block * configfs_sb = NULL;
-kmem_cache_t *configfs_dir_cachep;
+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,
 };
@@ -84,7 +84,7 @@ static int configfs_fill_super(struct super_block *sb, void *data, int silent)
                inode->i_op = &configfs_dir_inode_operations;
                inode->i_fop = &configfs_dir_operations;
                /* directory inodes start off with i_nlink == 2 (for "." entry) */
-               inode->i_nlink++;
+               inc_nlink(inode);
        } else {
                pr_debug("configfs: could not get root inode\n");
                return -ENOMEM;
@@ -118,7 +118,7 @@ static struct file_system_type configfs_fs_type = {
 
 int configfs_pin_fs(void)
 {
-       return simple_pin_fs("configfs", &configfs_mount,
+       return simple_pin_fs(&configfs_fs_type, &configfs_mount,
                             &configfs_mnt_count);
 }
 
@@ -136,11 +136,11 @@ static int __init configfs_init(void)
 
        configfs_dir_cachep = kmem_cache_create("configfs_dir_cache",
                                                sizeof(struct configfs_dirent),
-                                               0, 0, NULL, NULL);
+                                               0, 0, NULL);
        if (!configfs_dir_cachep)
                goto out;
 
-       kset_set_kset_s(&config_subsys, kernel_subsys);
+       kobj_set_kset_s(&config_subsys, kernel_subsys);
        err = subsystem_register(&config_subsys);
        if (err) {
                kmem_cache_destroy(configfs_dir_cachep);