[Devel,RHEL7,COMMIT] fuse: cleanup fuse_wait_on_page_writeback

Submitted by Konstantin Khorenko on Jan. 17, 2017, 12:10 p.m.

Details

Message ID 201701171210.v0HCAueZ014091@finist_cl7.x64_64.work.ct
State New
Series "fuse: some cleanup and fix FUSE_NOTIFY_INVAL_FILES deadlock"
Headers show

Commit Message

Konstantin Khorenko Jan. 17, 2017, 12:10 p.m.
The commit is pushed to "branch-rh7-3.10.0-514.vz7.27.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-514.vz7.27.12
------>
commit 105fe51391e87cd1743a520be5c01c49c19de87e
Author: Maxim Patlasov <mpatlasov@virtuozzo.com>
Date:   Tue Jan 17 16:10:56 2017 +0400

    fuse: cleanup fuse_wait_on_page_writeback
    
    fuse_wait_on_page_writeback and fuse_wait_on_page_writeback_or_invalidate
    always returns zero and nobody cares. Let make them void.
    
    Signed-off-by: Maxim Patlasov <mpatlasov@virtuozzo.com>
---
 fs/fuse/file.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

Patch hide | download patch | download mbox

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index c389d29..0a4ca51 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -557,27 +557,25 @@  static bool fuse_page_is_writeback(struct inode *inode, pgoff_t index)
  * Since fuse doesn't rely on the VM writeback tracking, this has to
  * use some other means.
  */
-static int fuse_wait_on_page_writeback(struct inode *inode, pgoff_t index)
+static void fuse_wait_on_page_writeback(struct inode *inode, pgoff_t index)
 {
 	struct fuse_inode *fi = get_fuse_inode(inode);
 
 	wait_event(fi->page_waitq, !fuse_page_is_writeback(inode, index));
-	return 0;
 }
 
 /*
  * Can be woken up by FUSE_NOTIFY_INVAL_FILES
  */
-static int fuse_wait_on_page_writeback_or_invalidate(struct inode *inode,
-						     struct file *file,
-						     pgoff_t index)
+static void fuse_wait_on_page_writeback_or_invalidate(struct inode *inode,
+						      struct file *file,
+						      pgoff_t index)
 {
 	struct fuse_inode *fi = get_fuse_inode(inode);
 	struct fuse_file *ff = file->private_data;
 
 	wait_event(fi->page_waitq, !fuse_page_is_writeback(inode, index) ||
 		   test_bit(FUSE_S_FAIL_IMMEDIATELY, &ff->ff_state));
-	return 0;
 }
 
 static void fuse_wait_on_writeback(struct inode *inode, pgoff_t start,