|
@@ -2181,7 +2181,7 @@ again:
|
|
dir_key->offset,
|
|
dir_key->offset,
|
|
name, name_len, 0);
|
|
name, name_len, 0);
|
|
}
|
|
}
|
|
- if (!log_di || (IS_ERR(log_di) && PTR_ERR(log_di) == -ENOENT)) {
|
|
|
|
|
|
+ if (!log_di || log_di == ERR_PTR(-ENOENT)) {
|
|
btrfs_dir_item_key_to_cpu(eb, di, &location);
|
|
btrfs_dir_item_key_to_cpu(eb, di, &location);
|
|
btrfs_release_path(path);
|
|
btrfs_release_path(path);
|
|
btrfs_release_path(log_path);
|
|
btrfs_release_path(log_path);
|
|
@@ -5011,8 +5011,7 @@ again:
|
|
* we don't need to do more work nor fallback to
|
|
* we don't need to do more work nor fallback to
|
|
* a transaction commit.
|
|
* a transaction commit.
|
|
*/
|
|
*/
|
|
- if (IS_ERR(other_inode) &&
|
|
|
|
- PTR_ERR(other_inode) == -ENOENT) {
|
|
|
|
|
|
+ if (other_inode == ERR_PTR(-ENOENT)) {
|
|
goto next_key;
|
|
goto next_key;
|
|
} else if (IS_ERR(other_inode)) {
|
|
} else if (IS_ERR(other_inode)) {
|
|
err = PTR_ERR(other_inode);
|
|
err = PTR_ERR(other_inode);
|