Skip to content

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

fuse: use filemap_check_errors() 

Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent d72d9e2a
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 12 deletions
fs/fuse/file.c
View file @ 4a7f4e88
...@@ -417,12 +417,7 @@ static int fuse_flush(struct file *file, fl_owner_t id) ...@@ -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, ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7