|
@@ -43,6 +43,19 @@ void __fscache_wait_on_page_write(struct fscache_cookie *cookie, struct page *pa
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(__fscache_wait_on_page_write);
|
|
EXPORT_SYMBOL(__fscache_wait_on_page_write);
|
|
|
|
|
|
|
|
+/*
|
|
|
|
+ * wait for a page to finish being written to the cache. Put a timeout here
|
|
|
|
+ * since we might be called recursively via parent fs.
|
|
|
|
+ */
|
|
|
|
+static
|
|
|
|
+bool release_page_wait_timeout(struct fscache_cookie *cookie, struct page *page)
|
|
|
|
+{
|
|
|
|
+ wait_queue_head_t *wq = bit_waitqueue(&cookie->flags, 0);
|
|
|
|
+
|
|
|
|
+ return wait_event_timeout(*wq, !__fscache_check_page_write(cookie, page),
|
|
|
|
+ HZ);
|
|
|
|
+}
|
|
|
|
+
|
|
/*
|
|
/*
|
|
* decide whether a page can be released, possibly by cancelling a store to it
|
|
* decide whether a page can be released, possibly by cancelling a store to it
|
|
* - we're allowed to sleep if __GFP_WAIT is flagged
|
|
* - we're allowed to sleep if __GFP_WAIT is flagged
|
|
@@ -115,7 +128,10 @@ page_busy:
|
|
}
|
|
}
|
|
|
|
|
|
fscache_stat(&fscache_n_store_vmscan_wait);
|
|
fscache_stat(&fscache_n_store_vmscan_wait);
|
|
- __fscache_wait_on_page_write(cookie, page);
|
|
|
|
|
|
+ if (!release_page_wait_timeout(cookie, page))
|
|
|
|
+ _debug("fscache writeout timeout page: %p{%lx}",
|
|
|
|
+ page, page->index);
|
|
|
|
+
|
|
gfp &= ~__GFP_WAIT;
|
|
gfp &= ~__GFP_WAIT;
|
|
goto try_again;
|
|
goto try_again;
|
|
}
|
|
}
|