2005-04-20 17:17:56

by Ed L. Cashin

[permalink] [raw]
Subject: [PATCH 2.6.12-rc2] aoe [5/6]: add firmware version to info in sysfs


add firmware version to info in sysfs

Signed-off-by: Ed L. Cashin <[email protected]>

diff -uprN a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
--- a/drivers/block/aoe/aoeblk.c 2005-04-20 11:41:18.000000000 -0400
+++ b/drivers/block/aoe/aoeblk.c 2005-04-20 11:42:23.000000000 -0400
@@ -37,6 +37,13 @@ static ssize_t aoedisk_show_netif(struct

return snprintf(page, PAGE_SIZE, "%s\n", d->ifp->name);
}
+/* firmware version */
+static ssize_t aoedisk_show_fwver(struct gendisk * disk, char *page)
+{
+ struct aoedev *d = disk->private_data;
+
+ return snprintf(page, PAGE_SIZE, "0x%04x\n", (unsigned int) d->fw_ver);
+}

static struct disk_attribute disk_attr_state = {
.attr = {.name = "state", .mode = S_IRUGO },
@@ -50,6 +57,10 @@ static struct disk_attribute disk_attr_n
.attr = {.name = "netif", .mode = S_IRUGO },
.show = aoedisk_show_netif
};
+static struct disk_attribute disk_attr_fwver = {
+ .attr = {.name = "fwver", .mode = S_IRUGO },
+ .show = aoedisk_show_fwver
+};

static void
aoedisk_add_sysfs(struct aoedev *d)
@@ -57,6 +68,7 @@ aoedisk_add_sysfs(struct aoedev *d)
sysfs_create_file(&d->gd->kobj, &disk_attr_state.attr);
sysfs_create_file(&d->gd->kobj, &disk_attr_mac.attr);
sysfs_create_file(&d->gd->kobj, &disk_attr_netif.attr);
+ sysfs_create_file(&d->gd->kobj, &disk_attr_fwver.attr);
}
void
aoedisk_rm_sysfs(struct aoedev *d)
@@ -64,6 +76,7 @@ aoedisk_rm_sysfs(struct aoedev *d)
sysfs_remove_link(&d->gd->kobj, "state");
sysfs_remove_link(&d->gd->kobj, "mac");
sysfs_remove_link(&d->gd->kobj, "netif");
+ sysfs_remove_link(&d->gd->kobj, "fwver");
}

static int


--
Ed L. Cashin <[email protected]>


2005-04-20 17:37:44

by Randy.Dunlap

[permalink] [raw]
Subject: Re: [PATCH 2.6.12-rc2] aoe [5/6]: add firmware version to info in sysfs


| add firmware version to info in sysfs
|
| +static struct disk_attribute disk_attr_fwver = {
| + .attr = {.name = "fwver", .mode = S_IRUGO },
| + .show = aoedisk_show_fwver
| +};
| @@ -64,6 +76,7 @@ aoedisk_rm_sysfs(struct aoedev *d)
| sysfs_remove_link(&d->gd->kobj, "state");
| sysfs_remove_link(&d->gd->kobj, "mac");
| sysfs_remove_link(&d->gd->kobj, "netif");
| + sysfs_remove_link(&d->gd->kobj, "fwver");


It's a good thing that you spelled out "firmware version"
for me.
Just seeing 'fwver' provided these comments from others:


n vwls s bd (well, it does have 'e'; maybe it shouldn't :)
friends fwver
fw is firewire


so something like 'firmware-version' would be appreciated
(for the sysfs filename).

Thanks,
---
~Randy