* [PATCH] fs/clntlock: remove sleep_on*() usage
@ 2005-01-26 19:40 ` Nishanth Aravamudan
0 siblings, 0 replies; 2+ messages in thread
From: Nishanth Aravamudan @ 2005-01-26 19:40 UTC (permalink / raw)
To: okir, matthew; +Cc: linux-fsdevel, kernel-janitors
Hi,
Please consider applying.
Description: Directly use wait-queues instead of the deprecated
sleep_on_timeout(). Since the sleep in this function is unconditional,
wait_event_timeout() does not appear to be appropriate. Patch is
compile-tested.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
--- 2.6.11-rc2-kj-v/fs/lockd/clntlock.c 2005-01-24 09:28:16.000000000 -0800
+++ 2.6.11-rc2-kj/fs/lockd/clntlock.c 2005-01-26 10:45:52.000000000 -0800
@@ -14,6 +14,7 @@
#include <linux/sunrpc/svc.h>
#include <linux/lockd/lockd.h>
#include <linux/smp_lock.h>
+#include <linux/wait.h>
#define NLMDBG_FACILITY NLMDBG_CLIENT
@@ -47,6 +48,7 @@ static struct nlm_wait * nlm_blocked;
int
nlmclnt_block(struct nlm_host *host, struct file_lock *fl, u32 *statp)
{
+ DEFINE_WAIT(wait);
struct nlm_wait block, **head;
int err;
u32 pstate;
@@ -69,7 +71,9 @@ nlmclnt_block(struct nlm_host *host, str
* a 1 minute timeout would do. See the comment before
* nlmclnt_lock for an explanation.
*/
- sleep_on_timeout(&block.b_wait, 30*HZ);
+ prepare_to_wait(&block.b_wait, &wait, TASK_UNINTERRUPTIBLE);
+ schedule_timeout(30*HZ);
+ finish_wait(&block.b_wait, &wait);
for (head = &nlm_blocked; *head; head = &(*head)->b_next) {
if (*head == &block) {
^ permalink raw reply [flat|nested] 2+ messages in thread
* [KJ] [PATCH] fs/clntlock: remove sleep_on*() usage
@ 2005-01-26 19:40 ` Nishanth Aravamudan
0 siblings, 0 replies; 2+ messages in thread
From: Nishanth Aravamudan @ 2005-01-26 19:40 UTC (permalink / raw)
To: okir, matthew; +Cc: linux-fsdevel, kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 1268 bytes --]
Hi,
Please consider applying.
Description: Directly use wait-queues instead of the deprecated
sleep_on_timeout(). Since the sleep in this function is unconditional,
wait_event_timeout() does not appear to be appropriate. Patch is
compile-tested.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
--- 2.6.11-rc2-kj-v/fs/lockd/clntlock.c 2005-01-24 09:28:16.000000000 -0800
+++ 2.6.11-rc2-kj/fs/lockd/clntlock.c 2005-01-26 10:45:52.000000000 -0800
@@ -14,6 +14,7 @@
#include <linux/sunrpc/svc.h>
#include <linux/lockd/lockd.h>
#include <linux/smp_lock.h>
+#include <linux/wait.h>
#define NLMDBG_FACILITY NLMDBG_CLIENT
@@ -47,6 +48,7 @@ static struct nlm_wait * nlm_blocked;
int
nlmclnt_block(struct nlm_host *host, struct file_lock *fl, u32 *statp)
{
+ DEFINE_WAIT(wait);
struct nlm_wait block, **head;
int err;
u32 pstate;
@@ -69,7 +71,9 @@ nlmclnt_block(struct nlm_host *host, str
* a 1 minute timeout would do. See the comment before
* nlmclnt_lock for an explanation.
*/
- sleep_on_timeout(&block.b_wait, 30*HZ);
+ prepare_to_wait(&block.b_wait, &wait, TASK_UNINTERRUPTIBLE);
+ schedule_timeout(30*HZ);
+ finish_wait(&block.b_wait, &wait);
for (head = &nlm_blocked; *head; head = &(*head)->b_next) {
if (*head == &block) {
[-- 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2005-01-26 19:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-01-26 19:40 [PATCH] fs/clntlock: remove sleep_on*() usage Nishanth Aravamudan
2005-01-26 19:40 ` [KJ] " Nishanth Aravamudan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.