From e8897756c9f29bb5aa0c8040b18ed48aa71382e7 Mon Sep 17 00:00:00 2001 From: David Howells Date: Wed, 24 Mar 2010 17:09:19 +0000 Subject: [PATCH] --- yaml --- r: 188975 b: refs/heads/master c: 61964eba5c419ff710ac996c5ed3a84d5af7490f h: refs/heads/master i: 188973: f0712c97bfb5b8ec9f3306e193e2244639ea61e9 188971: b41c79919c7aee5a14f32527ebccd3e31e68270b 188967: ccface700e0f0a7000306ca277bf0b9eef002fd7 188959: df626b426a51534f89f1366e97549bee95055f51 v: v3 --- [refs] | 2 +- trunk/fs/read_write.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5404225c7cdc..c95675cc9e0a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47568d4c56677ede6e7ff7c8e4e0fd860a9c4372 +refs/heads/master: 61964eba5c419ff710ac996c5ed3a84d5af7490f diff --git a/trunk/fs/read_write.c b/trunk/fs/read_write.c index b7f4a1f94d48..113386d6fd2d 100644 --- a/trunk/fs/read_write.c +++ b/trunk/fs/read_write.c @@ -258,6 +258,7 @@ ssize_t do_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *pp init_sync_kiocb(&kiocb, filp); kiocb.ki_pos = *ppos; kiocb.ki_left = len; + kiocb.ki_nbytes = len; for (;;) { ret = filp->f_op->aio_read(&kiocb, &iov, 1, kiocb.ki_pos); @@ -313,6 +314,7 @@ ssize_t do_sync_write(struct file *filp, const char __user *buf, size_t len, lof init_sync_kiocb(&kiocb, filp); kiocb.ki_pos = *ppos; kiocb.ki_left = len; + kiocb.ki_nbytes = len; for (;;) { ret = filp->f_op->aio_write(&kiocb, &iov, 1, kiocb.ki_pos);