Merge "fuse: fuse_flush() should wait on writeback" (81f8a4ef) · Commits · e / devices / android_kernel_sony_msm8994

fs/fuse/file.c

+23 −15

Original line number	Diff line number	Diff line
		@@ -393,6 +393,21 @@ static int fuse_wait_on_page_writeback(struct inode *inode, pgoff_t index)
		return 0;
		}

		/*
		* Wait for all pending writepages on the inode to finish.
		*
		* This is currently done by blocking further writes with FUSE_NOWRITE
		* and waiting for all sent writes to complete.
		*
		* This must be called under i_mutex, otherwise the FUSE_NOWRITE usage
		* could conflict with truncation.
		*/
		static void fuse_sync_writes(struct inode *inode)
		{
		fuse_set_nowrite(inode);
		fuse_release_nowrite(inode);
		}

		static int fuse_flush(struct file *file, fl_owner_t id)
		{
		struct inode *inode = file_inode(file);
		@@ -408,6 +423,14 @@ static int fuse_flush(struct file *file, fl_owner_t id)
		if (fc->no_flush)
		return 0;

		err = filemap_write_and_wait(file->f_mapping);
		if (err)
		return err;

		mutex_lock(&inode->i_mutex);
		fuse_sync_writes(inode);
		mutex_unlock(&inode->i_mutex);

		req = fuse_get_req_nofail_nopages(fc, file);
		memset(&inarg, 0, sizeof(inarg));
		inarg.fh = ff->fh;
		@@ -428,21 +451,6 @@ static int fuse_flush(struct file *file, fl_owner_t id)
		return err;
		}

		/*
		* Wait for all pending writepages on the inode to finish.
		*
		* This is currently done by blocking further writes with FUSE_NOWRITE
		* and waiting for all sent writes to complete.
		*
		* This must be called under i_mutex, otherwise the FUSE_NOWRITE usage
		* could conflict with truncation.
		*/
		static void fuse_sync_writes(struct inode *inode)
		{
		fuse_set_nowrite(inode);
		fuse_release_nowrite(inode);
		}

		int fuse_fsync_common(struct file *file, loff_t start, loff_t end,
		int datasync, int isdir)
		{