Skip to content

K
kernel_linux

OpenHarmony / kernel_linux
上一次同步 4 年多

通知 15
Star 8
Fork 2
K
kernel_linux
“0de8ce3ee8e38cc66683438f715c79a2cc69539e”上不存在“drivers/pci/controller/pci-hyperv.c”
提交 c40b7b06 编写于 作者: C Chris Mason
浏览文件
操作

Merge branch 'sysfs-fsdevices-4.2-part1' of... 

Merge branch 'sysfs-fsdevices-4.2-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into anand
上级 37b8d27d f90fc547
隐藏空白更改
内联 并排
Showing with 239 addition and 53 deletion
fs/btrfs/ctree.h
浏览文件 @ c40b7b06
...@@ -1619,10 +1619,7 @@ struct btrfs_fs_info { ...@@ -1619,10 +1619,7 @@ struct btrfs_fs_info {
struct task_struct *cleaner_kthread; struct task_struct *cleaner_kthread;
int thread_pool_size; int thread_pool_size;
struct kobject super_kobj;
struct kobject *space_info_kobj; struct kobject *space_info_kobj;
struct kobject *device_dir_kobj;
struct completion kobj_unregister;
int do_barriers; int do_barriers;
int closing; int closing;
int log_root_recovering; int log_root_recovering;
......
fs/btrfs/dev-replace.c
浏览文件 @ c40b7b06
...@@ -376,6 +376,10 @@ int btrfs_dev_replace_start(struct btrfs_root *root, ...@@ -376,6 +376,10 @@ int btrfs_dev_replace_start(struct btrfs_root *root,
WARN_ON(!tgt_device); WARN_ON(!tgt_device);
dev_replace->tgtdev = tgt_device; dev_replace->tgtdev = tgt_device;
ret = btrfs_kobj_add_device(tgt_device->fs_devices, tgt_device);
if (ret)
btrfs_error(root->fs_info, ret, "kobj add dev failed");
printk_in_rcu(KERN_INFO printk_in_rcu(KERN_INFO
"BTRFS: dev_replace from %s (devid %llu) to %s started\n", "BTRFS: dev_replace from %s (devid %llu) to %s started\n",
src_device->missing ? "<missing disk>" : src_device->missing ? "<missing disk>" :
...@@ -583,8 +587,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, ...@@ -583,8 +587,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
mutex_unlock(&uuid_mutex); mutex_unlock(&uuid_mutex);
/* replace the sysfs entry */ /* replace the sysfs entry */
btrfs_kobj_rm_device(fs_info, src_device); btrfs_kobj_rm_device(fs_info->fs_devices, src_device);
btrfs_kobj_add_device(fs_info, tgt_device);
btrfs_rm_dev_replace_free_srcdev(fs_info, src_device); btrfs_rm_dev_replace_free_srcdev(fs_info, src_device);
/* write back the superblocks */ /* write back the superblocks */
......
fs/btrfs/disk-io.c
浏览文件 @ c40b7b06
...@@ -2497,7 +2497,6 @@ int open_ctree(struct super_block *sb, ...@@ -2497,7 +2497,6 @@ int open_ctree(struct super_block *sb,
seqlock_init(&fs_info->profiles_lock); seqlock_init(&fs_info->profiles_lock);
init_rwsem(&fs_info->delayed_iput_sem); init_rwsem(&fs_info->delayed_iput_sem);
init_completion(&fs_info->kobj_unregister);
INIT_LIST_HEAD(&fs_info->dirty_cowonly_roots); INIT_LIST_HEAD(&fs_info->dirty_cowonly_roots);
INIT_LIST_HEAD(&fs_info->space_info); INIT_LIST_HEAD(&fs_info->space_info);
INIT_LIST_HEAD(&fs_info->tree_mod_seq_list); INIT_LIST_HEAD(&fs_info->tree_mod_seq_list);
...@@ -2877,10 +2876,22 @@ int open_ctree(struct super_block *sb, ...@@ -2877,10 +2876,22 @@ int open_ctree(struct super_block *sb,
btrfs_close_extra_devices(fs_devices, 1); btrfs_close_extra_devices(fs_devices, 1);
ret = btrfs_sysfs_add_fsid(fs_devices, NULL);
if (ret) {
pr_err("BTRFS: failed to init sysfs fsid interface: %d\n", ret);
goto fail_block_groups;
}
ret = btrfs_sysfs_add_device(fs_devices);
if (ret) {
pr_err("BTRFS: failed to init sysfs device interface: %d\n", ret);
goto fail_fsdev_sysfs;
}
ret = btrfs_sysfs_add_one(fs_info); ret = btrfs_sysfs_add_one(fs_info);
if (ret) { if (ret) {
pr_err("BTRFS: failed to init sysfs interface: %d\n", ret); pr_err("BTRFS: failed to init sysfs interface: %d\n", ret);
goto fail_block_groups; goto fail_fsdev_sysfs;
} }
ret = btrfs_init_space_info(fs_info); ret = btrfs_init_space_info(fs_info);
...@@ -3058,6 +3069,9 @@ int open_ctree(struct super_block *sb, ...@@ -3058,6 +3069,9 @@ int open_ctree(struct super_block *sb,
fail_sysfs: fail_sysfs:
btrfs_sysfs_remove_one(fs_info); btrfs_sysfs_remove_one(fs_info);
fail_fsdev_sysfs:
btrfs_sysfs_remove_fsid(fs_info->fs_devices);
fail_block_groups: fail_block_groups:
btrfs_put_block_group_cache(fs_info); btrfs_put_block_group_cache(fs_info);
btrfs_free_block_groups(fs_info); btrfs_free_block_groups(fs_info);
...@@ -3735,6 +3749,7 @@ void close_ctree(struct btrfs_root *root) ...@@ -3735,6 +3749,7 @@ void close_ctree(struct btrfs_root *root)
} }
btrfs_sysfs_remove_one(fs_info); btrfs_sysfs_remove_one(fs_info);
btrfs_sysfs_remove_fsid(fs_info->fs_devices);
btrfs_free_fs_roots(fs_info); btrfs_free_fs_roots(fs_info);
......
fs/btrfs/sysfs.c
浏览文件 @ c40b7b06
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include "volumes.h" #include "volumes.h"
static inline struct btrfs_fs_info *to_fs_info(struct kobject *kobj); static inline struct btrfs_fs_info *to_fs_info(struct kobject *kobj);
static inline struct btrfs_fs_devices *to_fs_devs(struct kobject *kobj);
static u64 get_features(struct btrfs_fs_info *fs_info, static u64 get_features(struct btrfs_fs_info *fs_info,
enum btrfs_feature_set set) enum btrfs_feature_set set)
...@@ -428,7 +429,7 @@ static ssize_t btrfs_clone_alignment_show(struct kobject *kobj, ...@@ -428,7 +429,7 @@ static ssize_t btrfs_clone_alignment_show(struct kobject *kobj,
BTRFS_ATTR(clone_alignment, btrfs_clone_alignment_show); BTRFS_ATTR(clone_alignment, btrfs_clone_alignment_show);
static struct attribute *btrfs_attrs[] = { static const struct attribute *btrfs_attrs[] = {
BTRFS_ATTR_PTR(label), BTRFS_ATTR_PTR(label),
BTRFS_ATTR_PTR(nodesize), BTRFS_ATTR_PTR(nodesize),
BTRFS_ATTR_PTR(sectorsize), BTRFS_ATTR_PTR(sectorsize),
...@@ -438,21 +439,29 @@ static struct attribute *btrfs_attrs[] = { ...@@ -438,21 +439,29 @@ static struct attribute *btrfs_attrs[] = {
static void btrfs_release_super_kobj(struct kobject *kobj) static void btrfs_release_super_kobj(struct kobject *kobj)
{ {
struct btrfs_fs_info *fs_info = to_fs_info(kobj); struct btrfs_fs_devices *fs_devs = to_fs_devs(kobj);
complete(&fs_info->kobj_unregister);
memset(&fs_devs->super_kobj, 0, sizeof(struct kobject));
complete(&fs_devs->kobj_unregister);
} }
static struct kobj_type btrfs_ktype = { static struct kobj_type btrfs_ktype = {
.sysfs_ops = &kobj_sysfs_ops, .sysfs_ops = &kobj_sysfs_ops,
.release = btrfs_release_super_kobj, .release = btrfs_release_super_kobj,
.default_attrs = btrfs_attrs,
}; };
static inline struct btrfs_fs_devices *to_fs_devs(struct kobject *kobj)
{
if (kobj->ktype != &btrfs_ktype)
return NULL;
return container_of(kobj, struct btrfs_fs_devices, super_kobj);
}
static inline struct btrfs_fs_info *to_fs_info(struct kobject *kobj) static inline struct btrfs_fs_info *to_fs_info(struct kobject *kobj)
{ {
if (kobj->ktype != &btrfs_ktype) if (kobj->ktype != &btrfs_ktype)
return NULL; return NULL;
return container_of(kobj, struct btrfs_fs_info, super_kobj); return to_fs_devs(kobj)->fs_info;
} }
#define NUM_FEATURE_BITS 64 #define NUM_FEATURE_BITS 64
...@@ -493,12 +502,12 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add) ...@@ -493,12 +502,12 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
attrs[0] = &fa->kobj_attr.attr; attrs[0] = &fa->kobj_attr.attr;
if (add) { if (add) {
int ret; int ret;
ret = sysfs_merge_group(&fs_info->super_kobj, ret = sysfs_merge_group(&fs_info->fs_devices->super_kobj,
&agroup); &agroup);
if (ret) if (ret)
return ret; return ret;
} else } else
sysfs_unmerge_group(&fs_info->super_kobj, sysfs_unmerge_group(&fs_info->fs_devices->super_kobj,
&agroup); &agroup);
} }
...@@ -506,25 +515,49 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add) ...@@ -506,25 +515,49 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
return 0; return 0;
} }
static void __btrfs_sysfs_remove_one(struct btrfs_fs_info *fs_info) static void __btrfs_sysfs_remove_fsid(struct btrfs_fs_devices *fs_devs)
{
if (fs_devs->device_dir_kobj) {
kobject_del(fs_devs->device_dir_kobj);
kobject_put(fs_devs->device_dir_kobj);
fs_devs->device_dir_kobj = NULL;
}
if (fs_devs->super_kobj.state_initialized) {
kobject_del(&fs_devs->super_kobj);
kobject_put(&fs_devs->super_kobj);
wait_for_completion(&fs_devs->kobj_unregister);
}
}
/* when fs_devs is NULL it will remove all fsid kobject */
void btrfs_sysfs_remove_fsid(struct btrfs_fs_devices *fs_devs)
{ {
kobject_del(&fs_info->super_kobj); struct list_head *fs_uuids = btrfs_get_fs_uuids();
kobject_put(&fs_info->super_kobj);
wait_for_completion(&fs_info->kobj_unregister); if (fs_devs) {
__btrfs_sysfs_remove_fsid(fs_devs);
return;
}
list_for_each_entry(fs_devs, fs_uuids, list) {
__btrfs_sysfs_remove_fsid(fs_devs);
}
} }
void btrfs_sysfs_remove_one(struct btrfs_fs_info *fs_info) void btrfs_sysfs_remove_one(struct btrfs_fs_info *fs_info)
{ {
btrfs_reset_fs_info_ptr(fs_info);
if (fs_info->space_info_kobj) { if (fs_info->space_info_kobj) {
sysfs_remove_files(fs_info->space_info_kobj, allocation_attrs); sysfs_remove_files(fs_info->space_info_kobj, allocation_attrs);
kobject_del(fs_info->space_info_kobj); kobject_del(fs_info->space_info_kobj);
kobject_put(fs_info->space_info_kobj); kobject_put(fs_info->space_info_kobj);
} }
kobject_del(fs_info->device_dir_kobj);
kobject_put(fs_info->device_dir_kobj);
addrm_unknown_feature_attrs(fs_info, false); addrm_unknown_feature_attrs(fs_info, false);
sysfs_remove_group(&fs_info->super_kobj, &btrfs_feature_attr_group); sysfs_remove_group(&fs_info->fs_devices->super_kobj, &btrfs_feature_attr_group);
__btrfs_sysfs_remove_one(fs_info); sysfs_remove_files(&fs_info->fs_devices->super_kobj, btrfs_attrs);
btrfs_kobj_rm_device(fs_info->fs_devices, NULL);
} }
const char * const btrfs_feature_set_names[3] = { const char * const btrfs_feature_set_names[3] = {
...@@ -602,40 +635,60 @@ static void init_feature_attrs(void) ...@@ -602,40 +635,60 @@ static void init_feature_attrs(void)
} }
} }
int btrfs_kobj_rm_device(struct btrfs_fs_info *fs_info, /* when one_device is NULL, it removes all device links */
int btrfs_kobj_rm_device(struct btrfs_fs_devices *fs_devices,
struct btrfs_device *one_device) struct btrfs_device *one_device)
{ {
struct hd_struct *disk; struct hd_struct *disk;
struct kobject *disk_kobj; struct kobject *disk_kobj;
if (!fs_info->device_dir_kobj) if (!fs_devices->device_dir_kobj)
return -EINVAL; return -EINVAL;
if (one_device && one_device->bdev) { if (one_device && one_device->bdev) {
disk = one_device->bdev->bd_part; disk = one_device->bdev->bd_part;
disk_kobj = &part_to_dev(disk)->kobj; disk_kobj = &part_to_dev(disk)->kobj;
sysfs_remove_link(fs_info->device_dir_kobj, sysfs_remove_link(fs_devices->device_dir_kobj,
disk_kobj->name);
}
if (one_device)
return 0;
list_for_each_entry(one_device,
&fs_devices->devices, dev_list) {
if (!one_device->bdev)
continue;
disk = one_device->bdev->bd_part;
disk_kobj = &part_to_dev(disk)->kobj;
sysfs_remove_link(fs_devices->device_dir_kobj,
disk_kobj->name); disk_kobj->name);
} }
return 0; return 0;
} }
int btrfs_kobj_add_device(struct btrfs_fs_info *fs_info, int btrfs_sysfs_add_device(struct btrfs_fs_devices *fs_devs)
struct btrfs_device *one_device)
{ {
int error = 0; if (!fs_devs->device_dir_kobj)
struct btrfs_fs_devices *fs_devices = fs_info->fs_devices; fs_devs->device_dir_kobj = kobject_create_and_add("devices",
struct btrfs_device *dev; &fs_devs->super_kobj);
if (!fs_info->device_dir_kobj)
fs_info->device_dir_kobj = kobject_create_and_add("devices",
&fs_info->super_kobj);
if (!fs_info->device_dir_kobj) if (!fs_devs->device_dir_kobj)
return -ENOMEM; return -ENOMEM;
return 0;
}
int btrfs_kobj_add_device(struct btrfs_fs_devices *fs_devices,
struct btrfs_device *one_device)
{
int error = 0;
struct btrfs_device *dev;
list_for_each_entry(dev, &fs_devices->devices, dev_list) { list_for_each_entry(dev, &fs_devices->devices, dev_list) {
struct hd_struct *disk; struct hd_struct *disk;
struct kobject *disk_kobj; struct kobject *disk_kobj;
...@@ -649,7 +702,7 @@ int btrfs_kobj_add_device(struct btrfs_fs_info *fs_info, ...@@ -649,7 +702,7 @@ int btrfs_kobj_add_device(struct btrfs_fs_info *fs_info,
disk = dev->bdev->bd_part; disk = dev->bdev->bd_part;
disk_kobj = &part_to_dev(disk)->kobj; disk_kobj = &part_to_dev(disk)->kobj;
error = sysfs_create_link(fs_info->device_dir_kobj, error = sysfs_create_link(fs_devices->device_dir_kobj,
disk_kobj, disk_kobj->name); disk_kobj, disk_kobj->name);
if (error) if (error)
break; break;
...@@ -667,34 +720,51 @@ static struct dentry *btrfs_debugfs_root_dentry; ...@@ -667,34 +720,51 @@ static struct dentry *btrfs_debugfs_root_dentry;
/* Debugging tunables and exported data */ /* Debugging tunables and exported data */
u64 btrfs_debugfs_test; u64 btrfs_debugfs_test;
/*
* Can be called by the device discovery thread.
* And parent can be specified for seed device
*/
int btrfs_sysfs_add_fsid(struct btrfs_fs_devices *fs_devs,
struct kobject *parent)
{
int error;
init_completion(&fs_devs->kobj_unregister);
fs_devs->super_kobj.kset = btrfs_kset;
error = kobject_init_and_add(&fs_devs->super_kobj,
&btrfs_ktype, parent, "%pU", fs_devs->fsid);
return error;
}
int btrfs_sysfs_add_one(struct btrfs_fs_info *fs_info) int btrfs_sysfs_add_one(struct btrfs_fs_info *fs_info)
{ {
int error; int error;
struct btrfs_fs_devices *fs_devs = fs_info->fs_devices;
struct kobject *super_kobj = &fs_devs->super_kobj;
btrfs_set_fs_info_ptr(fs_info);
init_completion(&fs_info->kobj_unregister); error = btrfs_kobj_add_device(fs_devs, NULL);
fs_info->super_kobj.kset = btrfs_kset;
error = kobject_init_and_add(&fs_info->super_kobj, &btrfs_ktype, NULL,
"%pU", fs_info->fsid);
if (error) if (error)
return error; return error;
error = sysfs_create_group(&fs_info->super_kobj, error = sysfs_create_files(super_kobj, btrfs_attrs);
&btrfs_feature_attr_group);
if (error) { if (error) {
__btrfs_sysfs_remove_one(fs_info); btrfs_kobj_rm_device(fs_devs, NULL);
return error; return error;
} }
error = addrm_unknown_feature_attrs(fs_info, true); error = sysfs_create_group(super_kobj,
&btrfs_feature_attr_group);
if (error) if (error)
goto failure; goto failure;
error = btrfs_kobj_add_device(fs_info, NULL); error = addrm_unknown_feature_attrs(fs_info, true);
if (error) if (error)
goto failure; goto failure;
fs_info->space_info_kobj = kobject_create_and_add("allocation", fs_info->space_info_kobj = kobject_create_and_add("allocation",
&fs_info->super_kobj); super_kobj);
if (!fs_info->space_info_kobj) { if (!fs_info->space_info_kobj) {
error = -ENOMEM; error = -ENOMEM;
goto failure; goto failure;
......
fs/btrfs/sysfs.h
浏览文件 @ c40b7b06
...@@ -82,8 +82,12 @@ char *btrfs_printable_features(enum btrfs_feature_set set, u64 flags); ...@@ -82,8 +82,12 @@ char *btrfs_printable_features(enum btrfs_feature_set set, u64 flags);
extern const char * const btrfs_feature_set_names[3]; extern const char * const btrfs_feature_set_names[3];
extern struct kobj_type space_info_ktype; extern struct kobj_type space_info_ktype;
extern struct kobj_type btrfs_raid_ktype; extern struct kobj_type btrfs_raid_ktype;
int btrfs_kobj_add_device(struct btrfs_fs_info *fs_info, int btrfs_kobj_add_device(struct btrfs_fs_devices *fs_devices,
struct btrfs_device *one_device); struct btrfs_device *one_device);
int btrfs_kobj_rm_device(struct btrfs_fs_info *fs_info, int btrfs_kobj_rm_device(struct btrfs_fs_devices *fs_devices,
struct btrfs_device *one_device); struct btrfs_device *one_device);
int btrfs_sysfs_add_fsid(struct btrfs_fs_devices *fs_devs,
struct kobject *parent);
int btrfs_sysfs_add_device(struct btrfs_fs_devices *fs_devs);
void btrfs_sysfs_remove_fsid(struct btrfs_fs_devices *fs_devs);
#endif /* _BTRFS_SYSFS_H_ */ #endif /* _BTRFS_SYSFS_H_ */
fs/btrfs/volumes.c
浏览文件 @ c40b7b06
...@@ -52,6 +52,10 @@ static void btrfs_dev_stat_print_on_load(struct btrfs_device *device); ...@@ -52,6 +52,10 @@ static void btrfs_dev_stat_print_on_load(struct btrfs_device *device);
DEFINE_MUTEX(uuid_mutex); DEFINE_MUTEX(uuid_mutex);
static LIST_HEAD(fs_uuids); static LIST_HEAD(fs_uuids);
struct list_head *btrfs_get_fs_uuids(void)
{
return &fs_uuids;
}
static struct btrfs_fs_devices *__alloc_fs_devices(void) static struct btrfs_fs_devices *__alloc_fs_devices(void)
{ {
...@@ -441,6 +445,61 @@ static void pending_bios_fn(struct btrfs_work *work) ...@@ -441,6 +445,61 @@ static void pending_bios_fn(struct btrfs_work *work)
run_scheduled_bios(device); run_scheduled_bios(device);
} }
void btrfs_free_stale_device(struct btrfs_device *cur_dev)
{
struct btrfs_fs_devices *fs_devs;
struct btrfs_device *dev;
if (!cur_dev->name)
return;
list_for_each_entry(fs_devs, &fs_uuids, list) {
int del = 1;
if (fs_devs->opened)
continue;
if (fs_devs->seeding)
continue;
list_for_each_entry(dev, &fs_devs->devices, dev_list) {
if (dev == cur_dev)
continue;
if (!dev->name)
continue;
/*
* Todo: This won't be enough. What if the same device
* comes back (with new uuid and) with its mapper path?
* But for now, this does help as mostly an admin will
* either use mapper or non mapper path throughout.
*/
rcu_read_lock();
del = strcmp(rcu_str_deref(dev->name),
rcu_str_deref(cur_dev->name));
rcu_read_unlock();
if (!del)
break;
}
if (!del) {
/* delete the stale device */
if (fs_devs->num_devices == 1) {
btrfs_sysfs_remove_fsid(fs_devs);
list_del(&fs_devs->list);
free_fs_devices(fs_devs);
} else {
fs_devs->num_devices--;
list_del(&dev->dev_list);
rcu_string_free(dev->name);
kfree(dev);
}
break;
}
}
}
/* /*
* Add new device to list of registered devices * Add new device to list of registered devices
* *
...@@ -556,6 +615,12 @@ static noinline int device_list_add(const char *path, ...@@ -556,6 +615,12 @@ static noinline int device_list_add(const char *path,
if (!fs_devices->opened) if (!fs_devices->opened)
device->generation = found_transid; device->generation = found_transid;
/*
* if there is new btrfs on an already registered device,
* then remove the stale device entry.
*/
btrfs_free_stale_device(device);
*fs_devices_ret = fs_devices; *fs_devices_ret = fs_devices;
return ret; return ret;
...@@ -1722,7 +1787,7 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path) ...@@ -1722,7 +1787,7 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path)
if (device->bdev) { if (device->bdev) {
device->fs_devices->open_devices--; device->fs_devices->open_devices--;
/* remove sysfs entry */ /* remove sysfs entry */
btrfs_kobj_rm_device(root->fs_info, device); btrfs_kobj_rm_device(root->fs_info->fs_devices, device);
} }
call_rcu(&device->rcu, free_device); call_rcu(&device->rcu, free_device);
...@@ -1891,6 +1956,9 @@ void btrfs_destroy_dev_replace_tgtdev(struct btrfs_fs_info *fs_info, ...@@ -1891,6 +1956,9 @@ void btrfs_destroy_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,
mutex_lock(&uuid_mutex); mutex_lock(&uuid_mutex);
WARN_ON(!tgtdev); WARN_ON(!tgtdev);
mutex_lock(&fs_info->fs_devices->device_list_mutex); mutex_lock(&fs_info->fs_devices->device_list_mutex);
btrfs_kobj_rm_device(fs_info->fs_devices, tgtdev);
if (tgtdev->bdev) { if (tgtdev->bdev) {
btrfs_scratch_superblock(tgtdev); btrfs_scratch_superblock(tgtdev);
fs_info->fs_devices->open_devices--; fs_info->fs_devices->open_devices--;
...@@ -2227,7 +2295,7 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path) ...@@ -2227,7 +2295,7 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path)
tmp + 1); tmp + 1);
/* add sysfs device entry */ /* add sysfs device entry */
btrfs_kobj_add_device(root->fs_info, device); btrfs_kobj_add_device(root->fs_info->fs_devices, device);
/* /*
* we've got more storage, clear any full flags on the space * we've got more storage, clear any full flags on the space
...@@ -2268,8 +2336,9 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path) ...@@ -2268,8 +2336,9 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path)
*/ */
snprintf(fsid_buf, BTRFS_UUID_UNPARSED_SIZE, "%pU", snprintf(fsid_buf, BTRFS_UUID_UNPARSED_SIZE, "%pU",
root->fs_info->fsid); root->fs_info->fsid);
if (kobject_rename(&root->fs_info->super_kobj, fsid_buf)) if (kobject_rename(&root->fs_info->fs_devices->super_kobj,
goto error_trans; fsid_buf))
pr_warn("BTRFS: sysfs: failed to create fsid for sprout\n");
} }
root->fs_info->num_tolerated_disk_barrier_failures = root->fs_info->num_tolerated_disk_barrier_failures =
...@@ -2305,7 +2374,7 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path) ...@@ -2305,7 +2374,7 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path)
error_trans: error_trans:
btrfs_end_transaction(trans, root); btrfs_end_transaction(trans, root);
rcu_string_free(device->name); rcu_string_free(device->name);
btrfs_kobj_rm_device(root->fs_info, device); btrfs_kobj_rm_device(root->fs_info->fs_devices, device);
kfree(device); kfree(device);
error: error:
blkdev_put(bdev, FMODE_EXCL); blkdev_put(bdev, FMODE_EXCL);
...@@ -6781,3 +6850,21 @@ void btrfs_update_commit_device_bytes_used(struct btrfs_root *root, ...@@ -6781,3 +6850,21 @@ void btrfs_update_commit_device_bytes_used(struct btrfs_root *root,
} }
unlock_chunks(root); unlock_chunks(root);
} }
void btrfs_set_fs_info_ptr(struct btrfs_fs_info *fs_info)
{
struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;
while (fs_devices) {
fs_devices->fs_info = fs_info;
fs_devices = fs_devices->seed;
}
}
void btrfs_reset_fs_info_ptr(struct btrfs_fs_info *fs_info)
{
struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;
while (fs_devices) {
fs_devices->fs_info = NULL;
fs_devices = fs_devices->seed;
}
}
fs/btrfs/volumes.h
浏览文件 @ c40b7b06
...@@ -253,6 +253,12 @@ struct btrfs_fs_devices { ...@@ -253,6 +253,12 @@ struct btrfs_fs_devices {
* nonrot flag set * nonrot flag set
*/ */
int rotating; int rotating;
struct btrfs_fs_info *fs_info;
/* sysfs kobjects */
struct kobject super_kobj;
struct kobject *device_dir_kobj;
struct completion kobj_unregister;
}; };
#define BTRFS_BIO_INLINE_CSUM_SIZE 64 #define BTRFS_BIO_INLINE_CSUM_SIZE 64
...@@ -537,5 +543,8 @@ static inline void unlock_chunks(struct btrfs_root *root) ...@@ -537,5 +543,8 @@ static inline void unlock_chunks(struct btrfs_root *root)
mutex_unlock(&root->fs_info->chunk_mutex); mutex_unlock(&root->fs_info->chunk_mutex);
} }
struct list_head *btrfs_get_fs_uuids(void);
void btrfs_set_fs_info_ptr(struct btrfs_fs_info *fs_info);
void btrfs_reset_fs_info_ptr(struct btrfs_fs_info *fs_info);
#endif #endif
lib/kobject.c
浏览文件 @ c40b7b06
...@@ -548,6 +548,7 @@ int kobject_move(struct kobject *kobj, struct kobject *new_parent) ...@@ -548,6 +548,7 @@ int kobject_move(struct kobject *kobj, struct kobject *new_parent)
kfree(devpath); kfree(devpath);
return error; return error;
} }
EXPORT_SYMBOL_GPL(kobject_move);
/** /**
* kobject_del - unlink kobject from hierarchy. * kobject_del - unlink kobject from hierarchy.
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或