Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ocfs2: use simple_read_from_buffer()

Browse source 
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Acked-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
This commit is contained in:
Akinobu Mita 2008-06-09 16:34:23 -07:00 committed by Mark Fasheh
parent dd25e55ea1
commit 7600c72b75
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
fs/ocfs2/stack_user.c
View file

@ -549,26 +549,17 @@ static ssize_t ocfs2_control_read(struct file *file,
size_t count,
loff_t *ppos)
{
char *proto_string = OCFS2_CONTROL_PROTO;
size_t to_write = 0;
ssize_t ret;
if (*ppos >= OCFS2_CONTROL_PROTO_LEN)
return 0;
to_write = OCFS2_CONTROL_PROTO_LEN - *ppos;
if (to_write > count)
to_write = count;
if (copy_to_user(buf, proto_string + *ppos, to_write))
return -EFAULT;
*ppos += to_write;
ret = simple_read_from_buffer(buf, count, ppos,
OCFS2_CONTROL_PROTO, OCFS2_CONTROL_PROTO_LEN);
/* Have we read the whole protocol list? */
if (*ppos >= OCFS2_CONTROL_PROTO_LEN)
if (ret > 0 && *ppos >= OCFS2_CONTROL_PROTO_LEN)
ocfs2_control_set_handshake_state(file,
OCFS2_CONTROL_HANDSHAKE_READ);
return to_write;
return ret;
}
static int ocfs2_control_release(struct inode *inode, struct file *file)