From: Al Viro Date: Sat, 14 Oct 2006 03:49:23 +0000 (-0400) Subject: [GFS2] gfs2 __user misannotation fix X-Git-Tag: v2.6.20-rc1~145^2^2~5^2~57 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9c9ab3d5414653bfe5e5b9f4dfdaab0c6ab17196;p=linux-2.6-omap-h63xx.git [GFS2] gfs2 __user misannotation fix Signed-off-by: Al Viro Signed-off-by: Steven Whitehouse --- diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c index 359965c368b..2fc8868e065 100644 --- a/fs/gfs2/ops_file.c +++ b/fs/gfs2/ops_file.c @@ -71,7 +71,7 @@ static int gfs2_read_actor(read_descriptor_t *desc, struct page *page, size = count; kaddr = kmap(page); - memcpy(desc->arg.buf, kaddr + offset, size); + memcpy(desc->arg.data, kaddr + offset, size); kunmap(page); desc->count = count - size; @@ -86,7 +86,7 @@ int gfs2_internal_read(struct gfs2_inode *ip, struct file_ra_state *ra_state, struct inode *inode = &ip->i_inode; read_descriptor_t desc; desc.written = 0; - desc.arg.buf = buf; + desc.arg.data = buf; desc.count = size; desc.error = 0; do_generic_mapping_read(inode->i_mapping, ra_state,