Commit a013d141 authored by Anand Jain's avatar Anand Jain Committed by David Sterba
Browse files

btrfs: sysfs, add UUID/devinfo kobject 



Create directory /sys/fs/btrfs/UUID/devinfo to hold devices directories
by the id (unlike /devices).

Signed-off-by: default avatarAnand Jain <anand.jain@oracle.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 28553fa9

fs/btrfs/sysfs.c

+15 −0
Original line number Original line Diff line number Diff line
@@ -901,6 +901,12 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add) 




static void __btrfs_sysfs_remove_fsid(struct btrfs_fs_devices *fs_devs)

static void __btrfs_sysfs_remove_fsid(struct btrfs_fs_devices *fs_devs)

{

{

	if (fs_devs->devinfo_kobj) {

		kobject_del(fs_devs->devinfo_kobj);

		kobject_put(fs_devs->devinfo_kobj);

		fs_devs->devinfo_kobj = NULL;

	}



	if (fs_devs->devices_kobj) {

	if (fs_devs->devices_kobj) {

		kobject_del(fs_devs->devices_kobj);

		kobject_del(fs_devs->devices_kobj);

		kobject_put(fs_devs->devices_kobj);

		kobject_put(fs_devs->devices_kobj);
@@ -1369,6 +1375,15 @@ int btrfs_sysfs_add_fsid(struct btrfs_fs_devices *fs_devs) 
		return -ENOMEM;

		return -ENOMEM;

	}

	}





	fs_devs->devinfo_kobj = kobject_create_and_add("devinfo",

						       &fs_devs->fsid_kobj);

	if (!fs_devs->devinfo_kobj) {

		btrfs_err(fs_devs->fs_info,

			  "failed to init sysfs devinfo kobject");

		btrfs_sysfs_remove_fsid(fs_devs);

		return -ENOMEM;

	}



	return 0;

	return 0;

}

}

fs/btrfs/volumes.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -258,6 +258,7 @@ struct btrfs_fs_devices { 
	/* sysfs kobjects */

	/* sysfs kobjects */

	struct kobject fsid_kobj;

	struct kobject fsid_kobj;

	struct kobject *devices_kobj;

	struct kobject *devices_kobj;

	struct kobject *devinfo_kobj;

	struct completion kobj_unregister;

	struct completion kobj_unregister;

};

};