Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 2cb4b05e7647891b46b91c07c9a60304803d1688

Authored by Changli Gao
Committed by Jens Axboe
1 parent 984bc9601f
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

splice: direct_splice_actor() should not use pos in sd 

direct_splice_actor() shouldn't use sd->pos, as sd->pos is for file reading,
file->f_pos should be used instead.

Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
----
 fs/splice.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

... ... @@ -1282,7 +1282,8 @@
1282 1282 {
1283 1283 struct file *file = sd->u.file;
1284 1284  
1285   - return do_splice_from(pipe, file, &sd->pos, sd->total_len, sd->flags);
  1285 + return do_splice_from(pipe, file, &file->f_pos, sd->total_len,
  1286 + sd->flags);
1286 1287 }
1287 1288  
1288 1289 /**