kobject: remove struct kobj_type from struct kset

[linux-2.6-omap-h63xx.git] / fs / debugfs / inode.c

diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
index 11be8a325e26d1b00070861bb74ddf14a0dc4284..f7f13516fc1a8e5f9fe1fa58c209039499223f5e 100644 (file)
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
@@ -413,7 +413,7 @@ struct dentry *debugfs_rename(struct dentry *old_dir, struct dentry *old_dentry,
        d_move(old_dentry, dentry);
        fsnotify_move(old_dir->d_inode, new_dir->d_inode, old_name,
                old_dentry->d_name.name, S_ISDIR(old_dentry->d_inode->i_mode),
-               NULL, old_dentry->d_inode);
+               NULL, old_dentry);
        fsnotify_oldname_free(old_name);
        unlock_rename(new_dir, old_dir);
        dput(dentry);
@@ -426,13 +426,13 @@ exit:
 }
 EXPORT_SYMBOL_GPL(debugfs_rename);
 
-static decl_subsys(debug, NULL, NULL);
+static decl_subsys(debug, NULL);
 
 static int __init debugfs_init(void)
 {
        int retval;
 
-       kobj_set_kset_s(&debug_subsys, kernel_subsys);
+       debug_subsys.kobj.kset = &kernel_subsys;
        retval = subsystem_register(&debug_subsys);
        if (retval)
                return retval;