Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09a9a45d authored by Stefan Richter's avatar Stefan Richter Committed by Linus Torvalds
Browse files

[PATCH] ieee1394: nodemgr: do not peek into struct semaphore 



Also revert patch "frv: ieee1394 is borken on frv", as it no longer is.

Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
Cc: David Howells <dhowells@redhat.com>
Cc: Jody McIntyre <scjody@modernduck.com>
Cc: Ben Collins <bcollins@ubuntu.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fb1bb34d

drivers/ieee1394/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ menu "IEEE 1394 (FireWire) support" 




config IEEE1394

config IEEE1394

	tristate "IEEE 1394 (FireWire) support"

	tristate "IEEE 1394 (FireWire) support"

	depends on (PCI || BROKEN) && (BROKEN || !FRV)

	depends on PCI || BROKEN

	select NET

	select NET

	help

	help

	  IEEE 1394 describes a high performance serial bus, which is also

	  IEEE 1394 describes a high performance serial bus, which is also

drivers/ieee1394/nodemgr.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * directory of the kernel sources for details.

 * directory of the kernel sources for details.

 */

 */





#include <linux/bitmap.h>

#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/config.h>

#include <linux/config.h>

#include <linux/list.h>

#include <linux/list.h>
@@ -334,10 +335,12 @@ static ssize_t fw_show_ne_bus_options(struct device *dev, struct device_attribut 
static DEVICE_ATTR(bus_options,S_IRUGO,fw_show_ne_bus_options,NULL);

static DEVICE_ATTR(bus_options,S_IRUGO,fw_show_ne_bus_options,NULL);









/* tlabels_free, tlabels_allocations, tlabels_mask are read non-atomically

 * here, therefore displayed values may be occasionally wrong. */

static ssize_t fw_show_ne_tlabels_free(struct device *dev, struct device_attribute *attr, char *buf)

static ssize_t fw_show_ne_tlabels_free(struct device *dev, struct device_attribute *attr, char *buf)

{

{

	struct node_entry *ne = container_of(dev, struct node_entry, device);

	struct node_entry *ne = container_of(dev, struct node_entry, device);

	return sprintf(buf, "%d\n", atomic_read(&ne->tpool->count.count) + 1);

	return sprintf(buf, "%d\n", 64 - bitmap_weight(ne->tpool->pool, 64));

}

}

static DEVICE_ATTR(tlabels_free,S_IRUGO,fw_show_ne_tlabels_free,NULL);

static DEVICE_ATTR(tlabels_free,S_IRUGO,fw_show_ne_tlabels_free,NULL);