diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-10-13 23:49:23 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-11-30 10:33:49 -0500 |
commit | 9c9ab3d5414653bfe5e5b9f4dfdaab0c6ab17196 (patch) | |
tree | ce0b04697ef40d4d8ea9b11981a8559bca12d27e /fs/gfs2 | |
parent | b44b84d765b02f813a67b96bf79e3b5d4d621631 (diff) |
[GFS2] gfs2 __user misannotation fix
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2')
-rw-r--r-- | fs/gfs2/ops_file.c | 4 |
1 files changed, 2 insertions, 2 deletions
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, | |||
71 | size = count; | 71 | size = count; |
72 | 72 | ||
73 | kaddr = kmap(page); | 73 | kaddr = kmap(page); |
74 | memcpy(desc->arg.buf, kaddr + offset, size); | 74 | memcpy(desc->arg.data, kaddr + offset, size); |
75 | kunmap(page); | 75 | kunmap(page); |
76 | 76 | ||
77 | desc->count = count - size; | 77 | desc->count = count - size; |
@@ -86,7 +86,7 @@ int gfs2_internal_read(struct gfs2_inode *ip, struct file_ra_state *ra_state, | |||
86 | struct inode *inode = &ip->i_inode; | 86 | struct inode *inode = &ip->i_inode; |
87 | read_descriptor_t desc; | 87 | read_descriptor_t desc; |
88 | desc.written = 0; | 88 | desc.written = 0; |
89 | desc.arg.buf = buf; | 89 | desc.arg.data = buf; |
90 | desc.count = size; | 90 | desc.count = size; |
91 | desc.error = 0; | 91 | desc.error = 0; |
92 | do_generic_mapping_read(inode->i_mapping, ra_state, | 92 | do_generic_mapping_read(inode->i_mapping, ra_state, |