From: Nishanth Aravamudan <nacc@us.ibm.com>
To: alan@redhat.com
Cc: netdev@oss.sgi.com, kernel-janitors@lists.osdl.org
Subject: [KJ] [PATCH 29/34] net/shaper: replace sleep_on() with wait_event()
Date: Tue, 25 Jan 2005 16:37:32 -0800 [thread overview]
Message-ID: <20050126003732.GU12649@us.ibm.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 986 bytes --]
Hi,
Please consider applying.
Description: Use wait_event() instead of the deprecated sleep_on().
Move the in_interrupt() check outside loop, as I do not believe the
process context should change once execution has begun. Patch is
compile-tested.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
--- 2.6.11-rc2-kj-v/drivers/net/shaper.c 2005-01-24 09:34:10.000000000 -0800
+++ 2.6.11-rc2-kj/drivers/net/shaper.c 2005-01-25 11:44:13.000000000 -0800
@@ -83,6 +83,7 @@
#include <linux/if_arp.h>
#include <linux/init.h>
#include <linux/if_shaper.h>
+#include <linux/wait.h>
#include <net/dst.h>
#include <net/arp.h>
@@ -109,14 +110,9 @@ static int shaper_lock(struct shaper *sh
/*
* Lock in an interrupt must fail
*/
- while (test_and_set_bit(0, &sh->locked))
- {
- if (!in_interrupt())
- sleep_on(&sh->wait_queue);
- else
- return 0;
-
- }
+ if (in_interrupt())
+ return 0;
+ wait_event(sh->wait_queue, !test_and_set_bit(0, &sh->locked));
return 1;
}
[-- Attachment #2: Type: text/plain, Size: 167 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
reply other threads:[~2005-01-26 0:37 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050126003732.GU12649@us.ibm.com \
--to=nacc@us.ibm.com \
--cc=alan@redhat.com \
--cc=kernel-janitors@lists.osdl.org \
--cc=netdev@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).