diff mbox

[V9fs-developer] 9p: set page uptodate when required in write_end()

Message ID 20170410184657.13430-1-alexander.levin@verizon.com (mailing list archive)
State Superseded, archived
Headers show

Commit Message

Levin, Alexander April 10, 2017, 6:46 p.m. UTC 
From: Alexander Levin <alexander.levin@verizon.com>

Commit 77469c3f570 prevented setting the page as uptodate when we wrote the
right amount of data, fix that.

Fixes: 77469c3f570 ("9p: saner ->write_end() on failing copy into non-uptodate page")
Reviewed-by: Jan Kara <jack@suse.com>
Signed-off-by: Alexander Levin <alexander.levin@verizon.com>
---
 fs/9p/vfs_addr.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Comments

Levin, Alexander June 2, 2017, 2:31 a.m. UTC | #1 
Ping?

On Mon, Apr 10, 2017 at 02:46:57PM -0400, Sasha Levin wrote:
> From: Alexander Levin <alexander.levin@verizon.com>
> 
> Commit 77469c3f570 prevented setting the page as uptodate when we wrote the
> right amount of data, fix that.
> 
> Fixes: 77469c3f570 ("9p: saner ->write_end() on failing copy into non-uptodate page")
> Reviewed-by: Jan Kara <jack@suse.com>
> Signed-off-by: Alexander Levin <alexander.levin@verizon.com>
> ---
>  fs/9p/vfs_addr.c | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
> index adaf6f6..e1cbdfd 100644
> --- a/fs/9p/vfs_addr.c
> +++ b/fs/9p/vfs_addr.c
> @@ -310,9 +310,13 @@ static int v9fs_write_end(struct file *filp, struct address_space *mapping,
>  
>  	p9_debug(P9_DEBUG_VFS, "filp %p, mapping %p\n", filp, mapping);
>  
> -	if (unlikely(copied < len && !PageUptodate(page))) {
> -		copied = 0;
> -		goto out;
> +	if (!PageUptodate(page)) {
> +		if (unlikely(copied < len)) {
> +			copied = 0;
> +			goto out;
> +		} else if (len == PAGE_SIZE) {
> +			SetPageUptodate(page);
> +		}
>  	}
>  	/*
>  	 * No need to use i_size_read() here, the i_size
> -- 
> 2.7.4
diff mbox

Patch

diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
index adaf6f6..e1cbdfd 100644
--- a/fs/9p/vfs_addr.c
+++ b/fs/9p/vfs_addr.c
@@ -310,9 +310,13 @@  static int v9fs_write_end(struct file *filp, struct address_space *mapping,
 
 	p9_debug(P9_DEBUG_VFS, "filp %p, mapping %p\n", filp, mapping);
 
-	if (unlikely(copied < len && !PageUptodate(page))) {
-		copied = 0;
-		goto out;
+	if (!PageUptodate(page)) {
+		if (unlikely(copied < len)) {
+			copied = 0;
+			goto out;
+		} else if (len == PAGE_SIZE) {
+			SetPageUptodate(page);
+		}
 	}
 	/*
 	 * No need to use i_size_read() here, the i_size