From: "Maxim V. Patlasov" Subject: [PATCH 10/14] fuse: fuse_writepage_locked() should wait on writeback Date: Fri, 25 Jan 2013 22:25:44 +0400 Message-ID: <20130125182527.10037.32471.stgit@maximpc.sw.ru> References: <20130125181700.10037.29163.stgit@maximpc.sw.ru> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: dev-bzQdu9zFT3WakBO8gow8eQ@public.gmane.org, xemul-bzQdu9zFT3WakBO8gow8eQ@public.gmane.org, fuse-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, jbottomley-bzQdu9zFT3WakBO8gow8eQ@public.gmane.org, viro-RmSDqhL/yNMiFSDQTTA3OLVCufUGDwFn@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devel-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org To: miklos-sUDqSbJrdHQHWmgEVkV9KA@public.gmane.org Return-path: In-Reply-To: <20130125181700.10037.29163.stgit-vWG5eQQidJHciZdyczg/7Q@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: fuse-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Id: linux-fsdevel.vger.kernel.org fuse_writepage_locked() should never submit new i/o for given page->index if there is another one 'in progress' already. In most cases it's safe to wait on page writeback. But if it was called due to memory shortage (WB_SYNC_NONE), we should redirty page rather than blocking caller. Signed-off-by: Maxim Patlasov --- fs/fuse/file.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 3b4dc98..52c7d81 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -1472,7 +1472,8 @@ static struct fuse_file *fuse_write_file(struct fuse_conn *fc, return ff; } -static int fuse_writepage_locked(struct page *page) +static int fuse_writepage_locked(struct page *page, + struct writeback_control *wbc) { struct address_space *mapping = page->mapping; struct inode *inode = mapping->host; @@ -1481,6 +1482,14 @@ static int fuse_writepage_locked(struct page *page) struct fuse_req *req; struct page *tmp_page; + if (fuse_page_is_writeback(inode, page->index)) { + if (wbc->sync_mode != WB_SYNC_ALL) { + redirty_page_for_writepage(wbc, page); + return 0; + } + fuse_wait_on_page_writeback(inode, page->index); + } + set_page_writeback(page); req = fuse_request_alloc_nofs(1); @@ -1527,7 +1536,7 @@ static int fuse_writepage(struct page *page, struct writeback_control *wbc) { int err; - err = fuse_writepage_locked(page); + err = fuse_writepage_locked(page, wbc); unlock_page(page); return err; @@ -1812,7 +1821,10 @@ static int fuse_launder_page(struct page *page) int err = 0; if (clear_page_dirty_for_io(page)) { struct inode *inode = page->mapping->host; - err = fuse_writepage_locked(page); + struct writeback_control wbc = { + .sync_mode = WB_SYNC_ALL, + }; + err = fuse_writepage_locked(page, &wbc); if (!err) fuse_wait_on_page_writeback(inode, page->index); } ------------------------------------------------------------------------------ Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft MVPs and experts. ON SALE this month only -- learn more at: http://p.sf.net/sfu/learnnow-d2d