提交 f9f3c6b6 编写于 作者: C Chris Mason 提交者: David Woodhouse

Btrfs: 2.6.21-git fixes

Signed-off-by: NChris Mason <chris.mason@oracle.com>
上级 de428b63
...@@ -1197,6 +1197,4 @@ struct btrfs_csum_item *btrfs_lookup_csum(struct btrfs_trans_handle *trans, ...@@ -1197,6 +1197,4 @@ struct btrfs_csum_item *btrfs_lookup_csum(struct btrfs_trans_handle *trans,
u64 objectid, u64 offset, u64 objectid, u64 offset,
int cow); int cow);
/* super.c */ /* super.c */
extern struct subsystem btrfs_subsys;
#endif #endif
...@@ -649,9 +649,6 @@ struct btrfs_root *open_ctree(struct super_block *sb) ...@@ -649,9 +649,6 @@ struct btrfs_root *open_ctree(struct super_block *sb)
fs_info->generation = btrfs_super_generation(disk_super) + 1; fs_info->generation = btrfs_super_generation(disk_super) + 1;
memset(&fs_info->kobj, 0, sizeof(fs_info->kobj)); memset(&fs_info->kobj, 0, sizeof(fs_info->kobj));
kobj_set_kset_s(fs_info, btrfs_subsys);
kobject_set_name(&fs_info->kobj, "%s", sb->s_id);
kobject_register(&fs_info->kobj);
mutex_unlock(&fs_info->fs_mutex); mutex_unlock(&fs_info->fs_mutex);
return tree_root; return tree_root;
} }
......
...@@ -18,24 +18,11 @@ ...@@ -18,24 +18,11 @@
#include "btrfs_inode.h" #include "btrfs_inode.h"
#include "ioctl.h" #include "ioctl.h"
static void btrfs_fsinfo_release(struct kobject *obj)
{
struct btrfs_fs_info *fsinfo = container_of(obj,
struct btrfs_fs_info, kobj);
kfree(fsinfo);
}
static struct kobj_type btrfs_fsinfo_ktype = {
.release = btrfs_fsinfo_release,
};
struct btrfs_iget_args { struct btrfs_iget_args {
u64 ino; u64 ino;
struct btrfs_root *root; struct btrfs_root *root;
}; };
decl_subsys(btrfs, &btrfs_fsinfo_ktype, NULL);
#define BTRFS_SUPER_MAGIC 0x9123682E #define BTRFS_SUPER_MAGIC 0x9123682E
static struct inode_operations btrfs_dir_inode_operations; static struct inode_operations btrfs_dir_inode_operations;
...@@ -2438,7 +2425,7 @@ static void init_once(void * foo, struct kmem_cache * cachep, ...@@ -2438,7 +2425,7 @@ static void init_once(void * foo, struct kmem_cache * cachep,
{ {
struct btrfs_inode *ei = (struct btrfs_inode *) foo; struct btrfs_inode *ei = (struct btrfs_inode *) foo;
if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) == if ((flags & (SLAB_CTOR_CONSTRUCTOR)) ==
SLAB_CTOR_CONSTRUCTOR) { SLAB_CTOR_CONSTRUCTOR) {
inode_init_once(&ei->vfs_inode); inode_init_once(&ei->vfs_inode);
} }
...@@ -2588,12 +2575,7 @@ static int __init init_btrfs_fs(void) ...@@ -2588,12 +2575,7 @@ static int __init init_btrfs_fs(void)
err = init_inodecache(); err = init_inodecache();
if (err) if (err)
return err; return err;
kset_set_kset_s(&btrfs_subsys, fs_subsys);
err = subsystem_register(&btrfs_subsys);
if (err)
goto out;
return register_filesystem(&btrfs_fs_type); return register_filesystem(&btrfs_fs_type);
out:
destroy_inodecache(); destroy_inodecache();
return err; return err;
} }
...@@ -2602,7 +2584,6 @@ static void __exit exit_btrfs_fs(void) ...@@ -2602,7 +2584,6 @@ static void __exit exit_btrfs_fs(void)
{ {
destroy_inodecache(); destroy_inodecache();
unregister_filesystem(&btrfs_fs_type); unregister_filesystem(&btrfs_fs_type);
subsystem_unregister(&btrfs_subsys);
printk("btrfs unloaded\n"); printk("btrfs unloaded\n");
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册