The patch titled
ieee1394: nodemgr: convert nodemgr_serialize semaphore to mutex
has been removed from the -mm tree. Its filename is
ieee1394-nodemgr-convert-nodemgr_serialize-semaphore.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: ieee1394: nodemgr: convert nodemgr_serialize semaphore to mutex
From: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Another trivial sem2mutex conversion.
Side note: nodemgr_serialize's purpose, when introduced in linux1394's
revision 529 in July 2002, was to protect several data structures which are
now largely handled by or together with Linux' driver core and are now
protected by the LDM's own mechanisms. It may very well be possible to remove
this mutex now. But fully parallelized node scanning is on our long-term TODO
list anyway; the mutex will certainly go away then.
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Cc: Ben Collins <bcollins@xxxxxxxxxx>
Cc: Jody McIntyre <scjody@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ieee1394/nodemgr.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff -puN drivers/ieee1394/nodemgr.c~ieee1394-nodemgr-convert-nodemgr_serialize-semaphore drivers/ieee1394/nodemgr.c
--- a/drivers/ieee1394/nodemgr.c~ieee1394-nodemgr-convert-nodemgr_serialize-semaphore
+++ a/drivers/ieee1394/nodemgr.c
@@ -158,7 +158,7 @@ static struct csr1212_bus_ops nodemgr_cs
* but now we are much simpler because of the LDM.
*/
-static DECLARE_MUTEX(nodemgr_serialize);
+static DEFINE_MUTEX(nodemgr_serialize);
struct host_info {
struct hpsb_host *host;
@@ -1621,7 +1621,7 @@ static int nodemgr_host_thread(void *__h
if (kthread_should_stop())
goto exit;
- if (down_interruptible(&nodemgr_serialize)) {
+ if (mutex_lock_interruptible(&nodemgr_serialize)) {
if (try_to_freeze())
continue;
goto exit;
@@ -1650,7 +1650,7 @@ static int nodemgr_host_thread(void *__h
if (!nodemgr_check_irm_capability(host, reset_cycles) ||
!nodemgr_do_irm_duties(host, reset_cycles)) {
reset_cycles++;
- up(&nodemgr_serialize);
+ mutex_unlock(&nodemgr_serialize);
continue;
}
reset_cycles = 0;
@@ -1668,10 +1668,10 @@ static int nodemgr_host_thread(void *__h
/* Update some of our sysfs symlinks */
nodemgr_update_host_dev_links(host);
- up(&nodemgr_serialize);
+ mutex_unlock(&nodemgr_serialize);
}
unlock_exit:
- up(&nodemgr_serialize);
+ mutex_unlock(&nodemgr_serialize);
exit:
HPSB_VERBOSE("NodeMgr: Exiting thread");
return 0;
_
Patches currently in -mm which might be from stefanr@xxxxxxxxxxxxxxxxx are
origin.patch
git-ieee1394.patch
ieee1394-fix-kerneldoc-of-hpsb_alloc_host.patch
ieee1394-shrink-tlabel-pools-remove-tpool-semaphores.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
