projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...
[cascardo/linux.git]
/
fs
/
btrfs
/
tree-log.c
diff --git
a/fs/btrfs/tree-log.c
b/fs/btrfs/tree-log.c
index
688df71
..
528cae1
100644
(file)
--- a/
fs/btrfs/tree-log.c
+++ b/
fs/btrfs/tree-log.c
@@
-3961,7
+3961,7
@@
static int wait_ordered_extents(struct btrfs_trans_handle *trans,
* i_mapping flags, so that the next fsync won't get
* an outdated io error too.
*/
* i_mapping flags, so that the next fsync won't get
* an outdated io error too.
*/
-
btrfs_inode_check_errors(inode
);
+
filemap_check_errors(inode->i_mapping
);
*ordered_io_error = true;
break;
}
*ordered_io_error = true;
break;
}
@@
-4198,7
+4198,7
@@
static int btrfs_log_changed_extents(struct btrfs_trans_handle *trans,
* without writing to the log tree and the fsync must report the
* file data write error and not commit the current transaction.
*/
* without writing to the log tree and the fsync must report the
* file data write error and not commit the current transaction.
*/
- ret =
btrfs_inode_check_errors(inode
);
+ ret =
filemap_check_errors(inode->i_mapping
);
if (ret)
ctx->io_err = ret;
process:
if (ret)
ctx->io_err = ret;
process: