summaryrefslogtreecommitdiffstats
path: root/fs/splice.c
diff options
context:
space:
mode:
authorCong Wang <amwang@redhat.com>2011-11-25 23:14:27 +0800
committerCong Wang <xiyou.wangcong@gmail.com>2012-03-20 21:48:21 +0800
commite8e3c3d66fd9d1ee2250f68d778cc48c1346d228 (patch)
tree2d69e1bb0cefe36bbfc4b75ddfa6cec8e72bcb98 /fs/splice.c
parentc6daa7ffa834c850b3dbb38af6980415caef680d (diff)
downloadlinux-e8e3c3d66fd9d1ee2250f68d778cc48c1346d228.tar.gz
linux-e8e3c3d66fd9d1ee2250f68d778cc48c1346d228.tar.bz2
linux-e8e3c3d66fd9d1ee2250f68d778cc48c1346d228.zip
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.c7
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,
goto out;
if (buf->page != page) {
- /*
- * Careful, ->map() uses KM_USER0!
- */
char *src = buf->ops->map(pipe, buf, 1);
- char *dst = kmap_atomic(page, KM_USER1);
+ char *dst = kmap_atomic(page);
memcpy(dst + offset, src + buf->offset, this_len);
flush_dcache_page(page);
- kunmap_atomic(dst, KM_USER1);
+ kunmap_atomic(dst);
buf->ops->unmap(pipe, buf, src);
}
ret = pagecache_write_end(file, mapping, sd->pos, this_len, this_len,