diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2007-07-24 04:17:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 19:02:55 -0400 |
| commit | 3836df6b520a2f93033bf53200b12a2cb5137395 (patch) | |
| tree | 4f08ef9fa7684b12b839481dc7bdc60b74d3d48b /fs | |
| parent | 2f66b529d9d131971e2509aee5478c61ca258ece (diff) | |
ocfs2: bad kunmap_atomic()
kunmap_atomic() takes the virtual address, not the mapped page as
argument.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Cc: Mark Fasheh <mark.fasheh@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ocfs2/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 5727cd18302a..c4034f693e7b 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c | |||
| @@ -2153,7 +2153,7 @@ static int ocfs2_splice_write_actor(struct pipe_inode_info *pipe, | |||
| 2153 | src = buf->ops->map(pipe, buf, 1); | 2153 | src = buf->ops->map(pipe, buf, 1); |
| 2154 | dst = kmap_atomic(page, KM_USER1); | 2154 | dst = kmap_atomic(page, KM_USER1); |
| 2155 | memcpy(dst + offset, src + buf->offset, count); | 2155 | memcpy(dst + offset, src + buf->offset, count); |
| 2156 | kunmap_atomic(page, KM_USER1); | 2156 | kunmap_atomic(dst, KM_USER1); |
| 2157 | buf->ops->unmap(pipe, buf, src); | 2157 | buf->ops->unmap(pipe, buf, src); |
| 2158 | 2158 | ||
| 2159 | copied = ocfs2_write_end(file, file->f_mapping, sd->pos, count, count, | 2159 | copied = ocfs2_write_end(file, file->f_mapping, sd->pos, count, count, |