|
@@ -252,6 +252,7 @@ static ssize_t hugetlbfs_read(struct file *filp, char __user *buf,
|
|
for (;;) {
|
|
for (;;) {
|
|
struct page *page;
|
|
struct page *page;
|
|
unsigned long nr, ret;
|
|
unsigned long nr, ret;
|
|
|
|
+ int ra;
|
|
|
|
|
|
/* nr is the maximum number of bytes to copy from this page */
|
|
/* nr is the maximum number of bytes to copy from this page */
|
|
nr = huge_page_size(h);
|
|
nr = huge_page_size(h);
|
|
@@ -274,16 +275,19 @@ static ssize_t hugetlbfs_read(struct file *filp, char __user *buf,
|
|
*/
|
|
*/
|
|
ret = len < nr ? len : nr;
|
|
ret = len < nr ? len : nr;
|
|
if (clear_user(buf, ret))
|
|
if (clear_user(buf, ret))
|
|
- ret = -EFAULT;
|
|
|
|
|
|
+ ra = -EFAULT;
|
|
|
|
+ else
|
|
|
|
+ ra = 0;
|
|
} else {
|
|
} else {
|
|
/*
|
|
/*
|
|
* We have the page, copy it to user space buffer.
|
|
* We have the page, copy it to user space buffer.
|
|
*/
|
|
*/
|
|
- ret = hugetlbfs_read_actor(page, offset, buf, len, nr);
|
|
|
|
|
|
+ ra = hugetlbfs_read_actor(page, offset, buf, len, nr);
|
|
|
|
+ ret = ra;
|
|
}
|
|
}
|
|
- if (ret < 0) {
|
|
|
|
|
|
+ if (ra < 0) {
|
|
if (retval == 0)
|
|
if (retval == 0)
|
|
- retval = ret;
|
|
|
|
|
|
+ retval = ra;
|
|
if (page)
|
|
if (page)
|
|
page_cache_release(page);
|
|
page_cache_release(page);
|
|
goto out;
|
|
goto out;
|