X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=wrapper%2Fsplice.h;h=91eb864c055df151641c471cadf1b5b5aaab9901;hb=886d51a3d7ed5fa6b41d7f19b3e14ae6c535a44c;hp=5f400747cb1bcb5c3c5070884a330b8de3a3fb3b;hpb=90225db5dd17d46fdb281a625ef98780329b0677;p=lttng-modules.git

diff --git a/wrapper/splice.h b/wrapper/splice.h
index 5f400747..91eb864c 100644
--- a/wrapper/splice.h
+++ b/wrapper/splice.h
@@ -1,46 +1,37 @@
-#ifndef _LTT_WRAPPER_SPLICE_H
-#define _LTT_WRAPPER_SPLICE_H
+#ifndef _LTTNG_WRAPPER_SPLICE_H
+#define _LTTNG_WRAPPER_SPLICE_H
 
 /*
- * Copyright (C) 2011 Mathieu Desnoyers (mathieu.desnoyers@efficios.com)
+ * wrapper/splice.h
  *
- * wrapper around vmalloc_sync_all. Using KALLSYMS to get its address when
+ * wrapper around splice_to_pipe. Using KALLSYMS to get its address when
  * available, else we need to have a kernel that exports this function to GPL
  * modules.
  *
- * Dual LGPL v2.1/GPL v2 license.
+ * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; only
+ * version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifdef CONFIG_KALLSYMS
-
-#include <linux/kallsyms.h>
 #include <linux/splice.h>
 
-static inline
 ssize_t wrapper_splice_to_pipe(struct pipe_inode_info *pipe,
-			       struct splice_pipe_desc *spd)
-{
-	ssize_t (*splice_to_pipe_sym)(struct pipe_inode_info *pipe,
-				      struct splice_pipe_desc *spd);
+			       struct splice_pipe_desc *spd);
 
-	splice_to_pipe_sym = (void *) kallsyms_lookup_name("splice_to_pipe");
-	if (splice_to_pipe_sym) {
-		return splice_to_pipe_sym(pipe, spd);
-	} else {
-		printk(KERN_WARNING "LTTng: splice_to_pipe symbol lookup failed.\n");
-		return -ENOSYS;
-	}
-}
-#else
-
-#include <linux/splice.h>
-
-static inline
-ssize_t wrapper_splice_to_pipe(struct pipe_inode_info *pipe,
-			       struct splice_pipe_desc *spd)
-{
-	return splice_to_pipe(pipe, spd);
-}
+#ifndef PIPE_DEF_BUFFERS
+#define PIPE_DEF_BUFFERS 16
 #endif
 
-#endif /* _LTT_WRAPPER_SPLICE_H */
+#endif /* _LTTNG_WRAPPER_SPLICE_H */