Commit 8f883c24 authored by Sage Weil's avatar Sage Weil

ceph: make write_begin wait propagate ERESTARTSYS

Currently, if the wait_event_interruptible is interrupted, we
return EAGAIN unconditionally and loop, such that we aren't, in
fact, interruptible.  So, propagate ERESTARTSYS if we get it.
Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent ec4318bc
...@@ -919,6 +919,10 @@ static int context_is_writeable_or_written(struct inode *inode, ...@@ -919,6 +919,10 @@ static int context_is_writeable_or_written(struct inode *inode,
/* /*
* We are only allowed to write into/dirty the page if the page is * We are only allowed to write into/dirty the page if the page is
* clean, or already dirty within the same snap context. * clean, or already dirty within the same snap context.
*
* called with page locked.
* return success with page locked,
* or any failure (incl -EAGAIN) with page unlocked.
*/ */
static int ceph_update_writeable_page(struct file *file, static int ceph_update_writeable_page(struct file *file,
loff_t pos, unsigned len, loff_t pos, unsigned len,
...@@ -961,9 +965,11 @@ static int ceph_update_writeable_page(struct file *file, ...@@ -961,9 +965,11 @@ static int ceph_update_writeable_page(struct file *file,
snapc = ceph_get_snap_context((void *)page->private); snapc = ceph_get_snap_context((void *)page->private);
unlock_page(page); unlock_page(page);
ceph_queue_writeback(inode); ceph_queue_writeback(inode);
wait_event_interruptible(ci->i_cap_wq, r = wait_event_interruptible(ci->i_cap_wq,
context_is_writeable_or_written(inode, snapc)); context_is_writeable_or_written(inode, snapc));
ceph_put_snap_context(snapc); ceph_put_snap_context(snapc);
if (r == -ERESTARTSYS)
return r;
return -EAGAIN; return -EAGAIN;
} }
...@@ -1035,7 +1041,7 @@ static int ceph_write_begin(struct file *file, struct address_space *mapping, ...@@ -1035,7 +1041,7 @@ static int ceph_write_begin(struct file *file, struct address_space *mapping,
int r; int r;
do { do {
/* get a page*/ /* get a page */
page = grab_cache_page_write_begin(mapping, index, 0); page = grab_cache_page_write_begin(mapping, index, 0);
if (!page) if (!page)
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment