Changeset 246

Timestamp:

10/02/13 15:59:20 (11 years ago)

Author:

atzm

Message:

support for linux 3.10 and later

Location:

ksyslog/trunk

Files:

• compat.h (added)
• ksyslog.c (modified) (7 diffs)
• ksyslog.h (modified) (1 diff)

ksyslog/trunk/ksyslog.c

@@ -5 +5 @@
  */
 
+#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/inet.h>
@@ -10 +11 @@
 #include <linux/udp.h>
 #include <linux/namei.h>
+#include <linux/proc_fs.h>
 #include <net/udp.h>
+#include "compat.h"
 #include "ksyslog.h"
 
@@ -443 +446 @@
 
         if (!err)
-                ((struct seq_file *)file->private_data)->private = PDE(inode)->data;
+                ((struct seq_file *)file->private_data)->private = PDE_DATA(inode);
 
         return err;
@@ -466 +469 @@
 ksyslog_nr_queued_seq_open(struct inode *inode, struct file *file)
 {
-        return single_open(file, ksyslog_nr_queued_seq_show, PDE(inode)->data);
+        return single_open(file, ksyslog_nr_queued_seq_show, PDE_DATA(inode));
 }
 
@@ -479 +482 @@
 ksyslog_nr_written_seq_open(struct inode *inode, struct file *file)
 {
-        return single_open(file, ksyslog_nr_written_seq_show, PDE(inode)->data);
+        return single_open(file, ksyslog_nr_written_seq_show, PDE_DATA(inode));
 }
 
@@ -492 +495 @@
 ksyslog_nr_dropped_seq_open(struct inode *inode, struct file *file)
 {
-        return single_open(file, ksyslog_nr_dropped_seq_show, PDE(inode)->data);
+        return single_open(file, ksyslog_nr_dropped_seq_show, PDE_DATA(inode));
 }
 
@@ -523 +526 @@
 {
         if (ksyslog_proc_queue)
-                remove_proc_entry(ksyslog_proc_queue->name, ksyslog_proc_queue->parent);
+                remove_proc_entry("queue", ksyslog_procdir);
         ksyslog_proc_queue = NULL;
 
         if (ksyslog_proc_nr_queued)
-                remove_proc_entry(ksyslog_proc_nr_queued->name, ksyslog_proc_nr_queued->parent);
+                remove_proc_entry("nr_queued", ksyslog_procdir);
         ksyslog_proc_nr_queued = NULL;
 
         if (ksyslog_proc_nr_written)
-                remove_proc_entry(ksyslog_proc_nr_written->name, ksyslog_proc_nr_written->parent);
+                remove_proc_entry("nr_written", ksyslog_procdir);
         ksyslog_proc_nr_written = NULL;
 
         if (ksyslog_proc_nr_dropped)
-                remove_proc_entry(ksyslog_proc_nr_dropped->name, ksyslog_proc_nr_dropped->parent);
+                remove_proc_entry("nr_dropped", ksyslog_procdir);
         ksyslog_proc_nr_dropped = NULL;
 
         if (ksyslog_procdir)
-                remove_proc_entry(ksyslog_procdir->name, ksyslog_procdir->parent);
+                remove_proc_entry("ksyslog", NULL);
         ksyslog_procdir = NULL;
 }

ksyslog/trunk/ksyslog.h

@@ -9 +9 @@
 
 #define UDP_ENCAP_KSYSLOG 16
-
-#ifndef __list_for_each_rcu
-#define __list_for_each_rcu(pos, head) \
-        for (pos = rcu_dereference_raw(list_next_rcu(head)); \
-                pos != (head); \
-                pos = rcu_dereference_raw(list_next_rcu(pos)))
-#endif
 
 enum ksyslog_facility {