Btrfs: 2.6.21-git fixes
Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
parent
de428b63b1
commit
f9f3c6b666
|
@ -1197,6 +1197,4 @@ struct btrfs_csum_item *btrfs_lookup_csum(struct btrfs_trans_handle *trans,
|
|||
u64 objectid, u64 offset,
|
||||
int cow);
|
||||
/* super.c */
|
||||
extern struct subsystem btrfs_subsys;
|
||||
|
||||
#endif
|
||||
|
|
|
@ -649,9 +649,6 @@ struct btrfs_root *open_ctree(struct super_block *sb)
|
|||
|
||||
fs_info->generation = btrfs_super_generation(disk_super) + 1;
|
||||
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);
|
||||
return tree_root;
|
||||
}
|
||||
|
|
|
@ -18,24 +18,11 @@
|
|||
#include "btrfs_inode.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 {
|
||||
u64 ino;
|
||||
struct btrfs_root *root;
|
||||
};
|
||||
|
||||
decl_subsys(btrfs, &btrfs_fsinfo_ktype, NULL);
|
||||
|
||||
#define BTRFS_SUPER_MAGIC 0x9123682E
|
||||
|
||||
static struct inode_operations btrfs_dir_inode_operations;
|
||||
|
@ -2438,7 +2425,7 @@ static void init_once(void * foo, struct kmem_cache * cachep,
|
|||
{
|
||||
struct btrfs_inode *ei = (struct btrfs_inode *) foo;
|
||||
|
||||
if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
|
||||
if ((flags & (SLAB_CTOR_CONSTRUCTOR)) ==
|
||||
SLAB_CTOR_CONSTRUCTOR) {
|
||||
inode_init_once(&ei->vfs_inode);
|
||||
}
|
||||
|
@ -2588,12 +2575,7 @@ static int __init init_btrfs_fs(void)
|
|||
err = init_inodecache();
|
||||
if (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);
|
||||
out:
|
||||
destroy_inodecache();
|
||||
return err;
|
||||
}
|
||||
|
@ -2602,7 +2584,6 @@ static void __exit exit_btrfs_fs(void)
|
|||
{
|
||||
destroy_inodecache();
|
||||
unregister_filesystem(&btrfs_fs_type);
|
||||
subsystem_unregister(&btrfs_subsys);
|
||||
printk("btrfs unloaded\n");
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue