This patch cancels and flushes any delayed work when the channel is
closed or reset.
Andrew, please apply.
Thanks,
Tom
Signed-off-by: Tom Zanussi <[email protected]>
diff -urpN -X dontdiff linux-2.6.12-mm1/fs/relayfs/relay.c linux-2.6.12-mm1-cur/fs/relayfs/relay.c
--- linux-2.6.12-mm1/fs/relayfs/relay.c 2005-06-22 11:16:23.000000000 -0500
+++ linux-2.6.12-mm1-cur/fs/relayfs/relay.c 2005-06-22 11:33:51.000000000 -0500
@@ -155,6 +155,10 @@ static inline void __relay_reset(struct
if (init) {
init_waitqueue_head(&buf->read_wait);
kref_init(&buf->kref);
+ INIT_WORK(&buf->wake_readers, NULL, NULL);
+ } else {
+ cancel_delayed_work(&buf->wake_readers);
+ flush_scheduled_work();
}
atomic_set(&buf->subbufs_produced, 0);
@@ -171,8 +175,6 @@ static inline void __relay_reset(struct
buf->offset = buf->chan->cb->subbuf_start(buf, buf->data, 0, NULL);
buf->commit[0] = buf->offset;
-
- INIT_WORK(&buf->wake_readers, NULL, NULL);
}
/**
@@ -238,6 +240,8 @@ static inline void relay_close_buf(struc
{
buf->finalized = 1;
buf->chan->cb = &default_channel_callbacks;
+ cancel_delayed_work(&buf->wake_readers);
+ flush_scheduled_work();
kref_put(&buf->kref, relay_remove_buf);
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
