[Devel,vz7,1/3] fuse: cleanup fuse_wait_on_page_writeback

Submitted by Maxim Patlasov on Dec. 22, 2016, 2:11 a.m.

Details

Message ID 148237263124.14654.11399151551085274024.stgit@maxim-thinkpad
State New
Series "fuse: some cleanup and fix FUSE_NOTIFY_INVAL_FILES deadlock"
Headers show

Commit Message

Maxim Patlasov Dec. 22, 2016, 2:11 a.m.
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 540c18b..880bba9 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,