diff --git a/[refs] b/[refs] index 6af40bfbd818..dcf6d77bff3a 100644 --- 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 index 6e7bfc125425..f277a9cdb50d 100644 --- 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 */ };