2008-06-01 23:28:17

by Akinobu Mita

Subject: [patch -v2 03/23] ocfs2: use simple_read_from_buffer

Signed-off-by: Akinobu Mita <[email protected]>
Cc: Mark Fasheh <[email protected]>
Cc: Joel Becker <[email protected]>
Cc: [email protected]
---
fs/ocfs2/stack_user.c | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)

Index: 2.6-git/fs/ocfs2/stack_user.c
===================================================================
--- 2.6-git.orig/fs/ocfs2/stack_user.c
+++ 2.6-git/fs/ocfs2/stack_user.c
@@ -549,26 +549,17 @@ static ssize_t ocfs2_control_read(struct
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)

--

2008-06-02 20:43:30

by Joel Becker

Subject: Re: [patch -v2 03/23] ocfs2: use simple_read_from_buffer

On Mon, Jun 02, 2008 at 08:13:32AM +0900, [email protected] wrote:
> Signed-off-by: Akinobu Mita <[email protected]>
> Cc: Mark Fasheh <[email protected]>
> Cc: Joel Becker <[email protected]>
> Cc: [email protected]

It looks good to my eyes, but I can't Ack it until I've had a
chance to test it.

Joel


--

"When ideas fail, words come in very handy."
- Goethe

Joel Becker
Principal Software Developer
Oracle
E-mail: [email protected]
Phone: (650) 506-8127