From: Taesoo Kim <tsgatesv@gmail.com>
Date: Fri, 20 Mar 2015 21:36:56 +0000 (-0400)
Subject: ceph: properly release page upon error
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c1d00b2d9c4fc821e33c5cdfbdbc32677cb0e2e0;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

ceph: properly release page upon error

When ceph_update_writeable_page fails (including -EAGAIN), it
unlocks (w/ unlock_page) the page but does not 'release'
(w/ page_cache_release) properly.

Upon error, properly set *pagep to NULL, indicating an error.

Signed-off-by: Taesoo Kim <tsgatesv@gmail.com>
Signed-off-by: Yan, Zheng <zyan@redhat.com>
---

diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index fd5599d32362..e723482c5f37 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -1146,6 +1146,10 @@ static int ceph_write_begin(struct file *file, struct address_space *mapping,
 		     inode, page, (int)pos, (int)len);
 
 		r = ceph_update_writeable_page(file, pos, len, page);
+		if (r < 0)
+			page_cache_release(page);
+		else
+			*pagep = page;
 	} while (r == -EAGAIN);
 
 	return r;