diff options
author | Cong Wang <amwang@redhat.com> | 2011-11-25 10:14:27 -0500 |
---|---|---|
committer | Cong Wang <xiyou.wangcong@gmail.com> | 2012-03-20 09:48:21 -0400 |
commit | e8e3c3d66fd9d1ee2250f68d778cc48c1346d228 (patch) | |
tree | 2d69e1bb0cefe36bbfc4b75ddfa6cec8e72bcb98 /fs/splice.c | |
parent | c6daa7ffa834c850b3dbb38af6980415caef680d (diff) |
fs: remove the second argument of k[un]map_atomic()
Acked-by: Benjamin LaHaise <bcrl@kvack.org>
Signed-off-by: Cong Wang <amwang@redhat.com>
Diffstat (limited to 'fs/splice.c')
-rw-r--r-- | fs/splice.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/splice.c b/fs/splice.c index 1ec0493266b3..f16402ed915c 100644 --- a/fs/splice.c +++ b/fs/splice.c | |||
@@ -737,15 +737,12 @@ int pipe_to_file(struct pipe_inode_info *pipe, struct pipe_buffer *buf, | |||
737 | goto out; | 737 | goto out; |
738 | 738 | ||
739 | if (buf->page != page) { | 739 | if (buf->page != page) { |
740 | /* | ||
741 | * Careful, ->map() uses KM_USER0! | ||
742 | */ | ||
743 | char *src = buf->ops->map(pipe, buf, 1); | 740 | char *src = buf->ops->map(pipe, buf, 1); |
744 | char *dst = kmap_atomic(page, KM_USER1); | 741 | char *dst = kmap_atomic(page); |
745 | 742 | ||
746 | memcpy(dst + offset, src + buf->offset, this_len); | 743 | memcpy(dst + offset, src + buf->offset, this_len); |
747 | flush_dcache_page(page); | 744 | flush_dcache_page(page); |
748 | kunmap_atomic(dst, KM_USER1); | 745 | kunmap_atomic(dst); |
749 | buf->ops->unmap(pipe, buf, src); | 746 | buf->ops->unmap(pipe, buf, src); |
750 | } | 747 | } |
751 | ret = pagecache_write_end(file, mapping, sd->pos, this_len, this_len, | 748 | ret = pagecache_write_end(file, mapping, sd->pos, this_len, this_len, |