diff options
| author | hunt <hunt> | 2007-04-27 14:02:30 +0000 |
|---|---|---|
| committer | hunt <hunt> | 2007-04-27 14:02:30 +0000 |
| commit | 79caf5aad82b3bc47b6b7b1b6d818695bf7bcb18 (patch) | |
| tree | 93aed0bf59525703e6a0b8ce5712aeadef6af86c | |
| parent | 522518f1c5c98325d6d746667ab0183af7922915 (diff) | |
| download | systemtap-steved-79caf5aad82b3bc47b6b7b1b6d818695bf7bcb18.tar.gz systemtap-steved-79caf5aad82b3bc47b6b7b1b6d818695bf7bcb18.tar.xz systemtap-steved-79caf5aad82b3bc47b6b7b1b6d818695bf7bcb18.zip | |
2007-04-27 Martin Hunt <hunt@redhat.com>
* utt.c (utt_trace_cleanup): Remove free of utt->sequence.
(utt_dropped_open): PR 4415. Use STAPCONF_INODE_PRIVATE to detect
correct inode struct.
(utt_trace_setup): Do not allocate utt->sequence.
| -rw-r--r-- | runtime/transport/ChangeLog | 7 | ||||
| -rw-r--r-- | runtime/transport/utt.c | 12 |
2 files changed, 11 insertions, 8 deletions
diff --git a/runtime/transport/ChangeLog b/runtime/transport/ChangeLog index 23257b5e..a8fcbb98 100644 --- a/runtime/transport/ChangeLog +++ b/runtime/transport/ChangeLog @@ -1,3 +1,10 @@ +2007-04-27 Martin Hunt <hunt@redhat.com> + + * utt.c (utt_trace_cleanup): Remove free of utt->sequence. + (utt_dropped_open): PR 4415. Use STAPCONF_INODE_PRIVATE to detect + correct inode struct. + (utt_trace_setup): Do not allocate utt->sequence. + 2007-04-02 Martin Hunt <hunt@redhat.com> * transport_msgs.h (struct _stp_msg_trans): Deleted. diff --git a/runtime/transport/utt.c b/runtime/transport/utt.c index 0c0dd02c..2389ccac 100644 --- a/runtime/transport/utt.c +++ b/runtime/transport/utt.c @@ -76,7 +76,6 @@ void utt_trace_cleanup(struct utt_trace *utt) relay_close(utt->rchan); debugfs_remove(utt->dropped_file); utt_remove_tree(utt); - free_percpu(utt->sequence); kfree(utt); } @@ -91,8 +90,11 @@ int utt_trace_remove(struct utt_trace *utt) static int utt_dropped_open(struct inode *inode, struct file *filp) { +#ifdef STAPCONF_INODE_PRIVATE filp->private_data = inode->i_private; - +#else + filp->private_data = inode->u.generic_ip; +#endif return 0; } @@ -186,10 +188,6 @@ struct utt_trace *utt_trace_setup(struct utt_trace_setup *utts) if (!utt) goto err; - utt->sequence = alloc_percpu(unsigned long); - if (!utt->sequence) - goto err; - ret = -ENOENT; dir = utt_create_tree(utt, utts->root, utts->name); if (!dir) @@ -228,8 +226,6 @@ err: if (utt) { if (utt->dropped_file) debugfs_remove(utt->dropped_file); - if (utt->sequence) - free_percpu(utt->sequence); if (utt->rchan) relay_close(utt->rchan); kfree(utt); |