Skip to contentSkip to conversation

ceph: properly release page upon error

PATCH In review Taesoo Kim 2 participants 2 messages Mar 20, 2015 – Mar 23, 2015 Ceph client

lore
Share & tools
lore

Taesoo Kim

author
#0 lore raw

PATCH 1/1 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.

---
 fs/ceph/addr.c | 4 ++++
 1 file changed, 4 insertions(+)
fs/ceph/addr.c +4 -0
index fd5599d..89091e3 100644
@@ -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) {
+			page_cache_release(page);
+			*pagep = NULL;
+		}
 	} while (r == -EAGAIN);
 
 	return r;
Signature · 1 line
2.3.3
#1 lore raw
Quoted 20 lines · 在 2015年3月21日,05:36,Taesoo Kim <[email protected]> 写道:

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.

---
fs/ceph/addr.c | 4 ++++

1 file changed, 4 insertions(+)
fs/ceph/addr.c +0 -0
index fd5599d..89091e3 100644

fs/ceph/addr.c static int ceph_write_begin(struct file *file, struct address_space *mapping, · line 1155

Quoted 10 lines
fs/ceph/addr.c +4 -0
@@ -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) {
+			page_cache_release(page);
+			*pagep = NULL;
+		}
 	} while (r == -EAGAIN);
 
 	return r;

Added to our testing branch. Thank you

Yan, Zheng

Quoted 1 line