diff options
| author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-02-24 08:35:26 +0700 |
|---|---|---|
| committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-02-24 08:35:26 +0700 |
| commit | 6c5dadef809982e05b16ba7cf309e7c642a1b56a (patch) | |
| tree | 1524a508c2cdf116b160732d002179e7537b20a7 /fs | |
| parent | ade046f9db4d92795249a3e3ce2b8cebf6dce0c7 (diff) | |
| parent | 21d69845e411bfcee426070af5416ddfba350529 (diff) | |
| download | kernel_samsung_aries-6c5dadef809982e05b16ba7cf309e7c642a1b56a.zip kernel_samsung_aries-6c5dadef809982e05b16ba7cf309e7c642a1b56a.tar.gz kernel_samsung_aries-6c5dadef809982e05b16ba7cf309e7c642a1b56a.tar.bz2 | |
Merge 3.0.66
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/splice.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/splice.c b/fs/splice.c index 9d89008..ea92b7c 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -693,8 +693,10 @@ static int pipe_to_sendpage(struct pipe_inode_info *pipe, return -EINVAL; more = (sd->flags & SPLICE_F_MORE) ? MSG_MORE : 0; - if (sd->len < sd->total_len) + + if (sd->len < sd->total_len && pipe->nrbufs > 1) more |= MSG_SENDPAGE_NOTLAST; + return file->f_op->sendpage(file, buf->page, buf->offset, sd->len, &pos, more); } |