Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c9ab3d5 authored by Al Viro's avatar Al Viro Committed by Steven Whitehouse
Browse files

[GFS2] gfs2 __user misannotation fix 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent b44b84d7

fs/gfs2/ops_file.c

+2 −2
Original line number Diff line number Diff line
@@ -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,