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.

diff --git a/runtime/transport/ChangeLog b/runtime/transport/ChangeLog
index 23257b5e3466cbd51bdfce108bb6a5a5c6dc18be..a8fcbb9866f85fdd90a359357ee7f5ecb86ab384 100644 (file)
--- 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 0c0dd02ce84dee285ca5da796521e0bf2732952f..2389ccace0e156bc3c630f96a180e23551617030 100644 (file)
--- 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);