From 9d66b8e0dbd91e1ffbd1a8fd78287da38d02d36f Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Thu, 30 Apr 2009 15:23:42 +0200 Subject: [PATCH] --- yaml --- r: 151265 b: refs/heads/master c: 1ce8a0d396288f28070483a8190843c23b8282f4 h: refs/heads/master i: 151263: 01ac14ebb4eadbc46837f4923755278229e9264d v: v3 --- [refs] | 2 +- trunk/drivers/block/aoe/aoechr.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 67b6150d4d60..abc738c2ece5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 02200d0664bc630b3525989cb8f49880bf8bda84 +refs/heads/master: 1ce8a0d396288f28070483a8190843c23b8282f4 diff --git a/trunk/drivers/block/aoe/aoechr.c b/trunk/drivers/block/aoe/aoechr.c index 200efc4d2c1e..19888354188f 100644 --- a/trunk/drivers/block/aoe/aoechr.c +++ b/trunk/drivers/block/aoe/aoechr.c @@ -266,6 +266,11 @@ static const struct file_operations aoe_fops = { .owner = THIS_MODULE, }; +static char *aoe_nodename(struct device *dev) +{ + return kasprintf(GFP_KERNEL, "etherd/%s", dev_name(dev)); +} + int __init aoechr_init(void) { @@ -283,6 +288,8 @@ aoechr_init(void) unregister_chrdev(AOE_MAJOR, "aoechr"); return PTR_ERR(aoe_class); } + aoe_class->nodename = aoe_nodename; + for (i = 0; i < ARRAY_SIZE(chardevs); ++i) device_create(aoe_class, NULL, MKDEV(AOE_MAJOR, chardevs[i].minor), NULL,