static ssize_t root_blocks_used_show(struct btrfs_root *root, char *buf)
{
return snprintf(buf, PAGE_SIZE, "%llu\n",
- (unsigned long long)btrfs_root_blocks_used(&root->root_item));
+ (unsigned long long)btrfs_root_used(&root->root_item));
}
static ssize_t root_block_limit_show(struct btrfs_root *root, char *buf)
{
return snprintf(buf, PAGE_SIZE, "%llu\n",
- (unsigned long long)btrfs_root_block_limit(&root->root_item));
+ (unsigned long long)btrfs_root_limit(&root->root_item));
}
static ssize_t super_blocks_used_show(struct btrfs_fs_info *fs, char *buf)
{
+
return snprintf(buf, PAGE_SIZE, "%llu\n",
- (unsigned long long)btrfs_super_blocks_used(fs->disk_super));
+ (unsigned long long)btrfs_super_bytes_used(&fs->super_copy));
}
static ssize_t super_total_blocks_show(struct btrfs_fs_info *fs, char *buf)
{
return snprintf(buf, PAGE_SIZE, "%llu\n",
- (unsigned long long)btrfs_super_total_blocks(fs->disk_super));
+ (unsigned long long)btrfs_super_total_bytes(&fs->super_copy));
}
static ssize_t super_blocksize_show(struct btrfs_fs_info *fs, char *buf)
{
return snprintf(buf, PAGE_SIZE, "%llu\n",
- (unsigned long long)btrfs_super_blocksize(fs->disk_super));
+ (unsigned long long)btrfs_super_sectorsize(&fs->super_copy));
}
/* this is for root attrs (subvols/snapshots) */
};
#define ROOT_ATTR(name, mode, show, store) \
-static struct btrfs_root_attr btrfs_root_attr_##name = __ATTR(name, mode, show, store)
+static struct btrfs_root_attr btrfs_root_attr_##name = __ATTR(name, mode, \
+ show, store)
ROOT_ATTR(blocks_used, 0444, root_blocks_used_show, NULL);
ROOT_ATTR(block_limit, 0644, root_block_limit_show, NULL);
};
#define SUPER_ATTR(name, mode, show, store) \
-static struct btrfs_super_attr btrfs_super_attr_##name = __ATTR(name, mode, show, store)
+static struct btrfs_super_attr btrfs_super_attr_##name = __ATTR(name, mode, \
+ show, store)
SUPER_ATTR(blocks_used, 0444, super_blocks_used_show, NULL);
SUPER_ATTR(total_blocks, 0444, super_total_blocks_show, NULL);
.release = btrfs_super_release,
};
-static struct kset btrfs_kset = {
- .kobj = {.name = "btrfs"},
-};
+/* /sys/fs/btrfs/ entry */
+static struct kset *btrfs_kset;
int btrfs_sysfs_add_super(struct btrfs_fs_info *fs)
{
int error;
-
- fs->super_kobj.kset = &btrfs_kset;
- fs->super_kobj.ktype = &btrfs_super_ktype;
-
- error = kobject_set_name(&fs->super_kobj, "%s",
- fs->sb->s_id);
- if (error)
+ char *name;
+ char c;
+ int len = strlen(fs->sb->s_id) + 1;
+ int i;
+
+ name = kmalloc(len, GFP_NOFS);
+ if (!name) {
+ error = -ENOMEM;
goto fail;
+ }
+
+ for (i = 0; i < len; i++) {
+ c = fs->sb->s_id[i];
+ if (c == '/' || c == '\\')
+ c = '!';
+ name[i] = c;
+ }
+ name[len] = '\0';
- error = kobject_register(&fs->super_kobj);
+ fs->super_kobj.kset = btrfs_kset;
+ error = kobject_init_and_add(&fs->super_kobj, &btrfs_super_ktype,
+ NULL, "%s", name);
+ kfree(name);
if (error)
goto fail;
{
int error;
- root->root_kobj.ktype = &btrfs_root_ktype;
- root->root_kobj.parent = &root->fs_info->super_kobj;
-
- error = kobject_set_name(&root->root_kobj, "%s", root->name);
- if (error) {
- goto fail;
- }
-
- error = kobject_register(&root->root_kobj);
+ error = kobject_init_and_add(&root->root_kobj, &btrfs_root_ktype,
+ &root->fs_info->super_kobj,
+ "%s", root->name);
if (error)
goto fail;
void btrfs_sysfs_del_root(struct btrfs_root *root)
{
- kobject_unregister(&root->root_kobj);
+ kobject_put(&root->root_kobj);
wait_for_completion(&root->kobj_unregister);
}
void btrfs_sysfs_del_super(struct btrfs_fs_info *fs)
{
- kobject_unregister(&fs->super_kobj);
+ kobject_put(&fs->super_kobj);
wait_for_completion(&fs->kobj_unregister);
}
-int btrfs_init_sysfs()
+int btrfs_init_sysfs(void)
{
- kobj_set_kset_s(&btrfs_kset, fs_subsys);
- return kset_register(&btrfs_kset);
+ btrfs_kset = kset_create_and_add("btrfs", NULL, fs_kobj);
+ if (!btrfs_kset)
+ return -ENOMEM;
+ return 0;
}
-void btrfs_exit_sysfs()
+void btrfs_exit_sysfs(void)
{
- kset_unregister(&btrfs_kset);
+ kset_unregister(btrfs_kset);
}
+