diff options
| author | trz <trz> | 2005-06-22 18:57:39 +0000 |
|---|---|---|
| committer | trz <trz> | 2005-06-22 18:57:39 +0000 |
| commit | c32a1f6186a9fa45d2aa45241be04428a006db11 (patch) | |
| tree | 68388ad0461292dcde56b0ce033a256bf3bf4e3b /runtime/relayfs/relay.c | |
| parent | 44705a5756d7b47c02566e0fbc2df3ed106d9aee (diff) | |
| download | systemtap-steved-c32a1f6186a9fa45d2aa45241be04428a006db11.tar.gz systemtap-steved-c32a1f6186a9fa45d2aa45241be04428a006db11.tar.xz systemtap-steved-c32a1f6186a9fa45d2aa45241be04428a006db11.zip | |
updated relayfs with latest patches
Diffstat (limited to 'runtime/relayfs/relay.c')
| -rw-r--r-- | runtime/relayfs/relay.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/runtime/relayfs/relay.c b/runtime/relayfs/relay.c index 5998db80..e35429ff 100644 --- a/runtime/relayfs/relay.c +++ b/runtime/relayfs/relay.c @@ -155,6 +155,10 @@ static inline void __relay_reset(struct rchan_buf *buf, int init) 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 rchan_buf *buf, int init) 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(struct rchan_buf *buf) { 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); } |