|
@@ -825,12 +825,18 @@ static void calc_cached_dev_sectors(struct cache_set *c)
|
|
void bch_cached_dev_run(struct cached_dev *dc)
|
|
void bch_cached_dev_run(struct cached_dev *dc)
|
|
{
|
|
{
|
|
struct bcache_device *d = &dc->disk;
|
|
struct bcache_device *d = &dc->disk;
|
|
|
|
+ char buf[SB_LABEL_SIZE + 1];
|
|
char *env[] = {
|
|
char *env[] = {
|
|
"DRIVER=bcache",
|
|
"DRIVER=bcache",
|
|
kasprintf(GFP_KERNEL, "CACHED_UUID=%pU", dc->sb.uuid),
|
|
kasprintf(GFP_KERNEL, "CACHED_UUID=%pU", dc->sb.uuid),
|
|
- NULL
|
|
|
|
|
|
+ NULL,
|
|
|
|
+ NULL,
|
|
};
|
|
};
|
|
|
|
|
|
|
|
+ memcpy(buf, dc->sb.label, SB_LABEL_SIZE);
|
|
|
|
+ buf[SB_LABEL_SIZE] = '\0';
|
|
|
|
+ env[2] = kasprintf(GFP_KERNEL, "CACHED_LABEL=%s", buf);
|
|
|
|
+
|
|
if (atomic_xchg(&dc->running, 1))
|
|
if (atomic_xchg(&dc->running, 1))
|
|
return;
|
|
return;
|
|
|
|
|
|
@@ -850,6 +856,7 @@ void bch_cached_dev_run(struct cached_dev *dc)
|
|
* only class / kset properties are persistent */
|
|
* only class / kset properties are persistent */
|
|
kobject_uevent_env(&disk_to_dev(d->disk)->kobj, KOBJ_CHANGE, env);
|
|
kobject_uevent_env(&disk_to_dev(d->disk)->kobj, KOBJ_CHANGE, env);
|
|
kfree(env[1]);
|
|
kfree(env[1]);
|
|
|
|
+ kfree(env[2]);
|
|
|
|
|
|
if (sysfs_create_link(&d->kobj, &disk_to_dev(d->disk)->kobj, "dev") ||
|
|
if (sysfs_create_link(&d->kobj, &disk_to_dev(d->disk)->kobj, "dev") ||
|
|
sysfs_create_link(&disk_to_dev(d->disk)->kobj, &d->kobj, "bcache"))
|
|
sysfs_create_link(&disk_to_dev(d->disk)->kobj, &d->kobj, "bcache"))
|