A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 11:11:45 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branches 'work.lookups', 'work.misc' and 'work.preadv2' into for-next

Browse source
This commit is contained in:
Al Viro 2016-03-18 16:07:38 -04:00
commit 8b23a8ce10
33 changed files with 488 additions and 465 deletions
Download patch file Download diff file Expand all files Collapse all files

5
fs/splice.c
View file

@ -185,6 +185,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
unsigned int spd_pages = spd->nr_pages;
int ret, do_wakeup, page_nr;
if (!spd_pages)
return 0;
ret = 0;
do_wakeup = 0;
page_nr = 0;
@ -577,7 +580,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
old_fs = get_fs();
set_fs(get_ds());
/* The cast to a user pointer is valid due to the set_fs() */
res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos, 0);
set_fs(old_fs);
return res;