summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2007-05-21 14:05:12 -0400
committerDavid Woodhouse <dwmw2@hera.kernel.org>2007-05-21 14:05:12 -0400
commitf9f3c6b666f717510b67036c314ec915b9059eaa (patch)
tree7e6214462efaa4672e832e602a90ab199095f045
parentde428b63b16f9c74a24228a517713e8c65f79475 (diff)
Btrfs: 2.6.21-git fixes
Signed-off-by: Chris Mason <chris.mason@oracle.com>
-rw-r--r--fs/btrfs/ctree.h2
-rw-r--r--fs/btrfs/disk-io.c3
-rw-r--r--fs/btrfs/super.c21
3 files changed, 1 insertions, 25 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 5830b4333d83..da12d8275817 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -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
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 4c0262b57664..3da057f78bc8 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -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;
}
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 0f79490123cf..0220c82841ad 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -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");
}