aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/ocfs2/stack_user.c19
1 files changed, 5 insertions, 14 deletions
diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c
index c021280dd462..24e0b19c8b69 100644
--- a/fs/ocfs2/stack_user.c
+++ b/fs/ocfs2/stack_user.c
@@ -549,26 +549,17 @@ static ssize_t ocfs2_control_read(struct file *file,
549 size_t count, 549 size_t count,
550 loff_t *ppos) 550 loff_t *ppos)
551{ 551{
552 char *proto_string = OCFS2_CONTROL_PROTO; 552 ssize_t ret;
553 size_t to_write = 0;
554
555 if (*ppos >= OCFS2_CONTROL_PROTO_LEN)
556 return 0;
557
558 to_write = OCFS2_CONTROL_PROTO_LEN - *ppos;
559 if (to_write > count)
560 to_write = count;
561 if (copy_to_user(buf, proto_string + *ppos, to_write))
562 return -EFAULT;
563 553
564 *ppos += to_write; 554 ret = simple_read_from_buffer(buf, count, ppos,
555 OCFS2_CONTROL_PROTO, OCFS2_CONTROL_PROTO_LEN);
565 556
566 /* Have we read the whole protocol list? */ 557 /* Have we read the whole protocol list? */
567 if (*ppos >= OCFS2_CONTROL_PROTO_LEN) 558 if (ret > 0 && *ppos >= OCFS2_CONTROL_PROTO_LEN)
568 ocfs2_control_set_handshake_state(file, 559 ocfs2_control_set_handshake_state(file,
569 OCFS2_CONTROL_HANDSHAKE_READ); 560 OCFS2_CONTROL_HANDSHAKE_READ);
570 561
571 return to_write; 562 return ret;
572} 563}
573 564
574static int ocfs2_control_release(struct inode *inode, struct file *file) 565static int ocfs2_control_release(struct inode *inode, struct file *file)