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 | |
| parent | b44b84d765b02f813a67b96bf79e3b5d4d621631 (diff) | |
| download | op-kernel-dev-9c9ab3d5414653bfe5e5b9f4dfdaab0c6ab17196.zip op-kernel-dev-9c9ab3d5414653bfe5e5b9f4dfdaab0c6ab17196.tar.gz | |
[GFS2] gfs2 __user misannotation fix
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
| -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 359965c..2fc8868 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, |
