[PATCH v0 2/4] Add hook for sysfs to btrfs.
From: Goffredo Baroncelli <hidden>
Date: 2012-08-23 12:12:37
Subsystem:
btrfs file system, filesystems (vfs and infrastructure), the rest · Maintainers:
Chris Mason, David Sterba, Alexander Viro, Christian Brauner, Linus Torvalds
Add the hook in the btrfs filesystem code to supporting sysfs. --- fs/btrfs/volumes.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index ecaad40..e1075ab 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c@@ -36,6 +36,7 @@ #include "async-thread.h" #include "check-integrity.h" #include "rcu-string.h" +#include "sysfs.h" static int init_first_rw_device(struct btrfs_trans_handle *trans, struct btrfs_root *root,
@@ -405,6 +406,8 @@ static noinline int device_list_add(const char *path, } } + btrfs_sysfs_add_device(device); + if (found_transid > fs_devices->latest_trans) { fs_devices->latest_devid = devid; fs_devices->latest_trans = found_transid;
@@ -458,6 +461,9 @@ static struct btrfs_fs_devices *clone_fs_devices(struct btrfs_fs_devices *orig) INIT_LIST_HEAD(&device->dev_alloc_list); list_add(&device->dev_list, &fs_devices->devices); + + btrfs_sysfs_add_device(device); + device->fs_devices = fs_devices; fs_devices->num_devices++; }
@@ -576,7 +582,7 @@ static int __btrfs_close_devices(struct btrfs_fs_devices *fs_devices) new_device->in_fs_metadata = 0; new_device->can_discard = 0; list_replace_rcu(&device->dev_list, &new_device->dev_list); - + //btrfs_sysfs_remove_device(device); call_rcu(&device->rcu, free_device); } mutex_unlock(&fs_devices->device_list_mutex);
@@ -1430,6 +1436,9 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path) cur_devices = device->fs_devices; mutex_lock(&root->fs_info->fs_devices->device_list_mutex); + + btrfs_sysfs_remove_device(device); + list_del_rcu(&device->dev_list); device->fs_devices->num_devices--;
@@ -1744,6 +1753,7 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path) */ mutex_lock(&root->fs_info->fs_devices->device_list_mutex); list_add_rcu(&device->dev_list, &root->fs_info->fs_devices->devices); + btrfs_sysfs_add_device(device); list_add(&device->dev_alloc_list, &root->fs_info->fs_devices->alloc_list); root->fs_info->fs_devices->num_devices++;
@@ -4306,6 +4316,9 @@ static struct btrfs_device *add_missing_dev(struct btrfs_root *root, spin_lock_init(&device->io_lock); INIT_LIST_HEAD(&device->dev_alloc_list); memcpy(device->uuid, dev_uuid, BTRFS_UUID_SIZE); + + btrfs_sysfs_add_device(device); + return device; }