aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Axboe2006-04-26 14:40:08 +0200
committerJens Axboe2006-04-26 14:40:08 +0200
commit1ebd32fc54bd04de6b3944587f25513c0681f98e (patch)
treecc68fe468c7b726fee37fa5e9058004382bae4d0
parent00522fb41a2a9bf0f98a007c0e2b516a3873148c (diff)
[PATCH] splice: add ->splice_write support for /dev/null
Useful for testing. Signed-off-by: Jens Axboe <axboe@suse.de>
-rw-r--r--drivers/char/mem.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 66719f9d294c..1fa9fa157c12 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -27,6 +27,7 @@
#include <linux/crash_dump.h>
#include <linux/backing-dev.h>
#include <linux/bootmem.h>
+#include <linux/pipe_fs_i.h>
#include <asm/uaccess.h>
#include <asm/io.h>
@@ -578,6 +579,18 @@ static ssize_t write_null(struct file * file, const char __user * buf,
return count;
}
+static int pipe_to_null(struct pipe_inode_info *info, struct pipe_buffer *buf,
+ struct splice_desc *sd)
+{
+ return sd->len;
+}
+
+static ssize_t splice_write_null(struct pipe_inode_info *pipe,struct file *out,
+ loff_t *ppos, size_t len, unsigned int flags)
+{
+ return splice_from_pipe(pipe, out, ppos, len, flags, pipe_to_null);
+}
+
#ifdef CONFIG_MMU
/*
* For fun, we are using the MMU for this.
@@ -785,6 +798,7 @@ static struct file_operations null_fops = {
.llseek = null_lseek,
.read = read_null,
.write = write_null,
+ .splice_write = splice_write_null,
};
#if defined(CONFIG_ISA) || !defined(__mc68000__)