Skip to contentSkip to conversation

aoe: remove too-strict BUG from aoedev teardown and update udev example

PATCH New Ed Cashin 1 participant 3 messages Aug 28, 2013

Subsystems (3)
lore
Share & tools
lore

Ed Cashin

author
#0 lore raw

cover aoe: remove too-strict BUG from aoedev teardown and update udev example

This patch series applies to linux-next/akpm fetched 22 August, commit a187db44dd9b24a9eed2141af962306a36935423. Yesterday's linux-next/akpm has no updates to the aoe files that could conflict, though.

Ed L. Cashin (2):
aoe: do not BUG if memory pressure prevented debugfs file creation
aoe: remove do-nothing NAME="%k" term from example udev rules

 Documentation/aoe/udev.txt |    2 +-
 drivers/block/aoe/aoeblk.c |    1 -
 2 files changed, 1 insertions(+), 2 deletions(-)
author
#1 lore raw

PATCH 1/2 aoe: do not BUG if memory pressure prevented debugfs file creation

If the system has trouble allocating memory for the creation of the aoe debugfs directory or of a file inside it, the debugfs member of an aoedev can be NULL.

Do not treat a NULL debugfs pointer as a BUG on aoedev shutdown, avoiding the user impact of an unecessary panic.

---
 drivers/block/aoe/aoeblk.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/block/aoe/aoeblk.c +0 -1
index d63dcf0..dd73e1f 100644
@@ -215,7 +215,6 @@ aoedisk_add_debugfs(struct aoedev *d)
 void
 aoedisk_rm_debugfs(struct aoedev *d)
 {
-	BUG_ON(d->debugfs == NULL);
 	debugfs_remove(d->debugfs);
 	d->debugfs = NULL;
 }
Signature · 1 line
1.7.1
author
#2 lore raw

PATCH 2/2 aoe: remove do-nothing NAME="%k" term from example udev rules

In reply to Ed Cashin

When the example udev rules in the documentation are used without modification, warnings like the one shown below appear in the system logs:

  /var/log/messages:Aug 22 11:09:11 kung udevd[445]: NAME="%k" \
    is superfluous and breaks kernel supplied names, please remove \
    it from /etc/udev/rules.d/60-aoe.rules:26

Removing the term does not cause any problems with the creation of the special character and block device nodes.

---
 Documentation/aoe/udev.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Documentation/aoe/udev.txt +1 -1
index 8686e78..1f06daf 100644
@@ -23,4 +23,4 @@ SUBSYSTEM=="aoe", KERNEL=="revalidate",	NAME="etherd/%k", GROUP="disk", MODE="02
 SUBSYSTEM=="aoe", KERNEL=="flush",	NAME="etherd/%k", GROUP="disk", MODE="0220"
 
 # aoe block devices     
-KERNEL=="etherd*",       NAME="%k", GROUP="disk"
+KERNEL=="etherd*",       GROUP="disk"
Signature · 1 line
1.7.1