AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[PATCH] splice: fix pipe_to_file() ->prepare_write() error path

Browse Source 
Don't jump to the unlock+release path, we already did that.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
Jens Axboe 2006-10-11 10:03:09 +02:00 committed by Jens Axboe
parent a22b169df1
commit e6e80f294c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/splice.c
View File

@ -607,7 +607,7 @@ static int pipe_to_file(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
ret = -ENOMEM;
page = page_cache_alloc_cold(mapping);
if (unlikely(!page))
goto out_nomem;
goto out_ret;
/*
* This will also lock the page
@ -666,7 +666,7 @@ static int pipe_to_file(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
if (sd->pos + this_len > isize)
vmtruncate(mapping->host, isize);
goto out;
goto out_ret;
}
if (buf->page != page) {
@ -698,7 +698,7 @@ static int pipe_to_file(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
out:
page_cache_release(page);
unlock_page(page);
out_nomem:
out_ret:
return ret;
}