diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-12-17 03:00:46 -0500 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-12-17 03:00:46 -0500 |
| commit | 10c937604b9d7752fe2e4ef9125da3865a36b229 (patch) | |
| tree | c983b35e8599c53339cca96622c723bb7f0d9b50 /fs/nfsd/vfs.c | |
| parent | f3c1e66f79f6a19951da10035c46faccc536ad59 (diff) | |
| parent | e61eb2e93fe86931d46831752a82dab25a5335ca (diff) | |
Merge branch 'for-2.6.38/core' into for-next
Diffstat (limited to 'fs/nfsd/vfs.c')
| -rw-r--r-- | fs/nfsd/vfs.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 184938fcff04..c6e08661adee 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c | |||
| @@ -847,10 +847,6 @@ nfsd_splice_actor(struct pipe_inode_info *pipe, struct pipe_buffer *buf, | |||
| 847 | size_t size; | 847 | size_t size; |
| 848 | int ret; | 848 | int ret; |
| 849 | 849 | ||
| 850 | ret = buf->ops->confirm(pipe, buf); | ||
| 851 | if (unlikely(ret)) | ||
| 852 | return ret; | ||
| 853 | |||
| 854 | size = sd->len; | 850 | size = sd->len; |
| 855 | 851 | ||
| 856 | if (rqstp->rq_res.page_len == 0) { | 852 | if (rqstp->rq_res.page_len == 0) { |