Changeset 264

Timestamp:

10/16/13 02:04:40 (11 years ago)

Author:

atzm

Message:

fsnotify_open compat

Location:

ksyslog/trunk

Files:

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

ksyslog/trunk/compat.h

@@ -14 +14 @@
                 pos = rcu_dereference_raw(list_next_rcu(pos)))
 #endif
+
+static inline void
+compat_fsnotify_open(struct file *file)
+{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)
+        fsnotify_open(file->f_path.dentry);
+#else
+        fsnotify_open(file);
+#endif
+}
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)

ksyslog/trunk/ksyslog.c

@@ -19 +19 @@
 #include "ksyslog.h"
 
-static DEFINE_SPINLOCK(ksyslog_vfs_lock);
-
 static struct ksyslog_queue ksyslog_queue;
 static struct socket *ksyslog_rcv_sk = NULL;
@@ -100 +98 @@
                 goto out;
 
-        fsnotify_open(file->f_path.dentry);
+        compat_fsnotify_open(file);
 
         if (unlikely(S_ISDIR(file->f_path.dentry->d_inode->i_mode))) {
@@ -321 +319 @@
                 goto out;
 
-        spin_lock(&ksyslog_vfs_lock);
-
         file = ksyslog_open(ksyslog_path);
         if (unlikely(IS_ERR(file))) {
-                spin_unlock(&ksyslog_vfs_lock);
-
                 spin_lock_bh(&ksyslog_queue.lock);
                 ksyslog_entry_migrate(&write_queue, &ksyslog_queue);
                 spin_unlock_bh(&ksyslog_queue.lock);
-
                 goto out;
         }
@@ -365 +358 @@
 
         ksyslog_close(file);
-        spin_unlock(&ksyslog_vfs_lock);
 
 out: