From ec5e00327c92da945195f7471ffe413a770f2d09 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Tue, 24 Jul 2007 10:17:50 +0200 Subject: [PATCH] --- yaml --- r: 62845 b: refs/heads/master c: 3836df6b520a2f93033bf53200b12a2cb5137395 h: refs/heads/master i: 62843: b0e50e28e0423653c5455c56039907f6913c3e55 v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/file.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9d7f1f10143e..6d510283871a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f66b529d9d131971e2509aee5478c61ca258ece +refs/heads/master: 3836df6b520a2f93033bf53200b12a2cb5137395 diff --git a/trunk/fs/ocfs2/file.c b/trunk/fs/ocfs2/file.c index 5727cd18302a..c4034f693e7b 100644 --- a/trunk/fs/ocfs2/file.c +++ b/trunk/fs/ocfs2/file.c @@ -2153,7 +2153,7 @@ static int ocfs2_splice_write_actor(struct pipe_inode_info *pipe, src = buf->ops->map(pipe, buf, 1); dst = kmap_atomic(page, KM_USER1); memcpy(dst + offset, src + buf->offset, count); - kunmap_atomic(page, KM_USER1); + kunmap_atomic(dst, KM_USER1); buf->ops->unmap(pipe, buf, src); copied = ocfs2_write_end(file, file->f_mapping, sd->pos, count, count,