From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sat, 14 Oct 2006 03:49:23 +0000 (-0400)
Subject: [GFS2] gfs2 __user misannotation fix
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9c9ab3d5414653bfe5e5b9f4dfdaab0c6ab17196;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

[GFS2] gfs2 __user misannotation fix

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
---

diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
index 359965c368bf..2fc8868e065c 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,