lkml.org 
[lkml]   [2015]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 13/15] hostfs: Set page flags in hostfs_readpage() correctly
Date
In case of an error set the page error flag and clear the up-to-date
flag.
If the read was successful clear the error flag unconditionally.

Signed-off-by: Richard Weinberger <richard@nod.at>
---
fs/hostfs/hostfs_kern.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
index cf80a30..f154747 100644
--- a/fs/hostfs/hostfs_kern.c
+++ b/fs/hostfs/hostfs_kern.c
@@ -445,24 +445,26 @@ static int hostfs_readpage(struct file *file, struct page *page)
{
char *buffer;
long long start;
- int bytes_read, ret;
+ int bytes_read, ret = 0;

start = (long long) page->index << PAGE_CACHE_SHIFT;
buffer = kmap(page);
bytes_read = read_file(FILE_HOSTFS_I(file)->fd, &start, buffer,
PAGE_CACHE_SIZE);
if (bytes_read < 0) {
+ ClearPageUptodate(page);
+ SetPageError(page);
ret = bytes_read;
goto out;
}

memset(buffer + bytes_read, 0, PAGE_CACHE_SIZE - bytes_read);

- flush_dcache_page(page);
+ ClearPageError(page);
SetPageUptodate(page);
- if (PageError(page)) ClearPageError(page);
- ret = 0;
+
out:
+ flush_dcache_page(page);
kunmap(page);
unlock_page(page);
return ret;
--
2.3.2


\
 
 \ /
  Last update: 2015-03-16 13:01    [from the cache]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and my Meterkast|Read the blog