Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a7f4e88 authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

fuse: use filemap_check_errors()

parent d72d9e2a
Loading
Loading
Loading
Loading
+2 −12
Original line number Original line Diff line number Diff line
@@ -417,12 +417,7 @@ static int fuse_flush(struct file *file, fl_owner_t id)
	fuse_sync_writes(inode);
	fuse_sync_writes(inode);
	inode_unlock(inode);
	inode_unlock(inode);


	if (test_bit(AS_ENOSPC, &file->f_mapping->flags) &&
	err = filemap_check_errors(file->f_mapping);
	    test_and_clear_bit(AS_ENOSPC, &file->f_mapping->flags))
		err = -ENOSPC;
	if (test_bit(AS_EIO, &file->f_mapping->flags) &&
	    test_and_clear_bit(AS_EIO, &file->f_mapping->flags))
		err = -EIO;
	if (err)
	if (err)
		return err;
		return err;


@@ -477,12 +472,7 @@ int fuse_fsync_common(struct file *file, loff_t start, loff_t end,
	 * filemap_write_and_wait_range() does not catch errors.
	 * filemap_write_and_wait_range() does not catch errors.
	 * We have to do this directly after fuse_sync_writes()
	 * We have to do this directly after fuse_sync_writes()
	 */
	 */
	if (test_bit(AS_ENOSPC, &file->f_mapping->flags) &&
	err = filemap_check_errors(file->f_mapping);
	    test_and_clear_bit(AS_ENOSPC, &file->f_mapping->flags))
		err = -ENOSPC;
	if (test_bit(AS_EIO, &file->f_mapping->flags) &&
	    test_and_clear_bit(AS_EIO, &file->f_mapping->flags))
		err = -EIO;
	if (err)
	if (err)
		goto out;
		goto out;