From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932475Ab3AYSYm (ORCPT ); Fri, 25 Jan 2013 13:24:42 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:21127 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932402Ab3AYSYl (ORCPT ); Fri, 25 Jan 2013 13:24:41 -0500 Subject: [PATCH 08/14] fuse: Flush files on wb close To: miklos@szeredi.hu From: "Maxim V. Patlasov" Cc: dev@parallels.com, xemul@parallels.com, fuse-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, jbottomley@parallels.com, viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org, devel@openvz.org Date: Fri, 25 Jan 2013 22:24:21 +0400 Message-ID: <20130125182407.10037.26333.stgit@maximpc.sw.ru> In-Reply-To: <20130125181700.10037.29163.stgit@maximpc.sw.ru> References: <20130125181700.10037.29163.stgit@maximpc.sw.ru> User-Agent: StGit/0.15 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Any write request requires a file handle to report to the userspace. Thus when we close a file (and free the fuse_file with this info) we have to flush all the outstanding writeback cache. Note, that simply calling the filemap_write_and_wait() is not enough since fuse finishes page writeback immediately and thus the -wait part of the mentioned call will be no-op. Do real wait on per-inode writepages list. Signed-off-by: Maxim Patlasov Signed-off-by: Pavel Emelyanov --- fs/fuse/file.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 4f8fa45..496e74c 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -138,6 +138,12 @@ static void fuse_file_put(struct fuse_file *ff, bool sync) } } +static void __fuse_file_put(struct fuse_file *ff) +{ + if (atomic_dec_and_test(&ff->count)) + BUG(); +} + int fuse_do_open(struct fuse_conn *fc, u64 nodeid, struct file *file, bool isdir) { @@ -286,8 +292,23 @@ static int fuse_open(struct inode *inode, struct file *file) return fuse_open_common(inode, file, false); } +static void fuse_flush_writeback(struct inode *inode, struct file *file) +{ + struct fuse_conn *fc = get_fuse_conn(inode); + struct fuse_inode *fi = get_fuse_inode(inode); + + filemap_write_and_wait(file->f_mapping); + wait_event(fi->page_waitq, list_empty_careful(&fi->writepages)); + spin_unlock_wait(&fc->lock); +} + static int fuse_release(struct inode *inode, struct file *file) { + struct fuse_conn *fc = get_fuse_conn(inode); + + if (fc->writeback_cache) + fuse_flush_writeback(inode, file); + fuse_release_common(file, FUSE_RELEASE); /* return value is ignored by VFS */ @@ -1343,7 +1364,8 @@ static void fuse_writepage_free(struct fuse_conn *fc, struct fuse_req *req) for (i = 0; i < req->num_pages; i++) __free_page(req->pages[i]); - fuse_file_put(req->ff, false); + if (!fc->writeback_cache) + fuse_file_put(req->ff, false); } static void fuse_writepage_finish(struct fuse_conn *fc, struct fuse_req *req) @@ -1360,6 +1382,8 @@ static void fuse_writepage_finish(struct fuse_conn *fc, struct fuse_req *req) } bdi_writeout_inc(bdi); wake_up(&fi->page_waitq); + if (fc->writeback_cache) + __fuse_file_put(req->ff); } /* Called under fc->lock, may release and reacquire it */ From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Maxim V. Patlasov" Subject: [PATCH 08/14] fuse: Flush files on wb close Date: Fri, 25 Jan 2013 22:24:21 +0400 Message-ID: <20130125182407.10037.26333.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 Any write request requires a file handle to report to the userspace. Thus when we close a file (and free the fuse_file with this info) we have to flush all the outstanding writeback cache. Note, that simply calling the filemap_write_and_wait() is not enough since fuse finishes page writeback immediately and thus the -wait part of the mentioned call will be no-op. Do real wait on per-inode writepages list. Signed-off-by: Maxim Patlasov Signed-off-by: Pavel Emelyanov --- fs/fuse/file.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 4f8fa45..496e74c 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -138,6 +138,12 @@ static void fuse_file_put(struct fuse_file *ff, bool sync) } } +static void __fuse_file_put(struct fuse_file *ff) +{ + if (atomic_dec_and_test(&ff->count)) + BUG(); +} + int fuse_do_open(struct fuse_conn *fc, u64 nodeid, struct file *file, bool isdir) { @@ -286,8 +292,23 @@ static int fuse_open(struct inode *inode, struct file *file) return fuse_open_common(inode, file, false); } +static void fuse_flush_writeback(struct inode *inode, struct file *file) +{ + struct fuse_conn *fc = get_fuse_conn(inode); + struct fuse_inode *fi = get_fuse_inode(inode); + + filemap_write_and_wait(file->f_mapping); + wait_event(fi->page_waitq, list_empty_careful(&fi->writepages)); + spin_unlock_wait(&fc->lock); +} + static int fuse_release(struct inode *inode, struct file *file) { + struct fuse_conn *fc = get_fuse_conn(inode); + + if (fc->writeback_cache) + fuse_flush_writeback(inode, file); + fuse_release_common(file, FUSE_RELEASE); /* return value is ignored by VFS */ @@ -1343,7 +1364,8 @@ static void fuse_writepage_free(struct fuse_conn *fc, struct fuse_req *req) for (i = 0; i < req->num_pages; i++) __free_page(req->pages[i]); - fuse_file_put(req->ff, false); + if (!fc->writeback_cache) + fuse_file_put(req->ff, false); } static void fuse_writepage_finish(struct fuse_conn *fc, struct fuse_req *req) @@ -1360,6 +1382,8 @@ static void fuse_writepage_finish(struct fuse_conn *fc, struct fuse_req *req) } bdi_writeout_inc(bdi); wake_up(&fi->page_waitq); + if (fc->writeback_cache) + __fuse_file_put(req->ff); } /* Called under fc->lock, may release and reacquire it */ ------------------------------------------------------------------------------ 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