---

yaml --- r: 58522 b: refs/heads/master c: 130610d h: refs/heads/master v: v3
git-mirror · Jul 10, 2007 · 0cc2f79 · 0cc2f79
1 parent fb12e21
commit 0cc2f79
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0452a4e5d021900b07ebdeecb9ed03b49f164f3f
+refs/heads/master: 130610d6f681c5d970340897f5db000d04a7ef78
diff --git a/trunk/include/linux/pipe_fs_i.h b/trunk/include/linux/pipe_fs_i.h
@@ -94,6 +94,7 @@ struct splice_desc {
 	union {
 		void __user *userptr;	/* memory to write to */
 		struct file *file;	/* file to read/write */
+		void *data;		/* cookie */
 	} u;
 	loff_t pos;			/* file position */
 };