summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorTom Zanussi <zanussi@us.ibm.com>2005-12-20 13:10:22 -0600
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-20 17:33:22 -0800
commitfd30fc3256824f03c2ff9317269d66f72f7042ca (patch)
tree863a1ba4ddae961e2727343c17d15f64c3f4d463 /fs
parentbb44f116a14c4c932f15c79acfafd46bcb43ca9a (diff)
downloadkernel-crypto-fd30fc3256824f03c2ff9317269d66f72f7042ca.tar.gz
kernel-crypto-fd30fc3256824f03c2ff9317269d66f72f7042ca.tar.xz
kernel-crypto-fd30fc3256824f03c2ff9317269d66f72f7042ca.zip
[PATCH] relayfs: remove warning printk() in relay_switch_subbuf()
There's currently a diagnostic printk in relay_switch_subbuf() meant as a warning if you accidentally try to log an event larger than the sub-buffer size. The problem is if this happens while logging from somewhere it's not safe to be doing printks, such as in the scheduler, you can end up with a deadlock. This patch removes the warning from relay_switch_subbuf() and instead prints some diagnostic info when the channel is closed. Thanks to Mathieu Desnoyers for pointing out the problem and suggesting a fix. Signed-off-by: Tom Zanussi <zanussi@us.ibm.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/relayfs/relay.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/relayfs/relay.c b/fs/relayfs/relay.c
index 16446a15c96..2a6f7f12b7f 100644
--- a/fs/relayfs/relay.c
+++ b/fs/relayfs/relay.c
@@ -333,8 +333,7 @@ size_t relay_switch_subbuf(struct rchan_buf *buf, size_t length)
return length;
toobig:
- printk(KERN_WARNING "relayfs: event too large (%Zd)\n", length);
- WARN_ON(1);
+ buf->chan->last_toobig = length;
return 0;
}
@@ -399,6 +398,11 @@ void relay_close(struct rchan *chan)
relay_close_buf(chan->buf[i]);
}
+ if (chan->last_toobig)
+ printk(KERN_WARNING "relayfs: one or more items not logged "
+ "[item size (%Zd) > sub-buffer size (%Zd)]\n",
+ chan->last_toobig, chan->subbuf_size);
+
kref_put(&chan->kref, relay_destroy_channel);
}