diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 05:48:45 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 05:48:45 -0500 |
| commit | 24e1c13c93cbdd05e4b7ea921c0050b036555adc (patch) | |
| tree | 60e5b54f1ce6db72507e6f20f19bffe5854793b8 /fs | |
| parent | 31fa5d2868cfa6b51e39989e2a2ab99ce4566cb2 (diff) | |
| parent | 3bc217ffe6774e7971d6a7ce6350ce806ebab044 (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
block: kill swap_io_context()
as-iosched: fix inconsistent ioc->lock context
ide-cd: fix leftover data BUG
block: make elevator lib checkpatch compliant
cfq-iosched: make checkpatch compliant
block: make core bits checkpatch compliant
block: new end request handling interface should take unsigned byte counts
unexport add_disk_randomness
block/sunvdc.c:print_version() must be __devinit
splice: always updated atime in direct splice
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/splice.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/splice.c b/fs/splice.c index 1577a7391d23..4ee49e86edde 100644 --- a/fs/splice.c +++ b/fs/splice.c | |||
| @@ -1033,9 +1033,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd, | |||
| 1033 | 1033 | ||
| 1034 | done: | 1034 | done: |
| 1035 | pipe->nrbufs = pipe->curbuf = 0; | 1035 | pipe->nrbufs = pipe->curbuf = 0; |
| 1036 | if (bytes > 0) | 1036 | file_accessed(in); |
| 1037 | file_accessed(in); | ||
| 1038 | |||
| 1039 | return bytes; | 1037 | return bytes; |
| 1040 | 1038 | ||
| 1041 | out_release: | 1039 | out_release: |