btrfs: simplify IS_ERR/PTR_ERR checks

IS_ERR(p) && PTR_ERR(p) == n is a weird way to spell p == ERR_PTR(n).

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Reviewed-by: David Sterba <dsterba@suse.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
[ update changelog ]
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 001ed1bc2aa89a294c1250831e58ecd670cb2ff9..3b84f50150299d6ddf7ce57617cde98282bf8214 100644 (file)
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -680,7 +680,7 @@ btrfs_attach_transaction_barrier(struct btrfs_root *root)
 
        trans = start_transaction(root, 0, TRANS_ATTACH,
                                  BTRFS_RESERVE_NO_FLUSH, true);
-       if (IS_ERR(trans) && PTR_ERR(trans) == -ENOENT)
+       if (trans == ERR_PTR(-ENOENT))
                btrfs_wait_for_commit(root->fs_info, 0);
 
        return trans;

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 730b97dee95550b6ea4a8605e3c311fd52b869d6..1650dc44a5e37e483efebcf1a9e84117b0a1ed6a 100644 (file)
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -2181,7 +2181,7 @@ again:
                                                     dir_key->offset,
                                                     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_release_path(path);
                        btrfs_release_path(log_path);
@@ -5011,8 +5011,7 @@ again:
                                 * we don't need to do more work nor fallback to
                                 * a transaction commit.
                                 */
-                               if (IS_ERR(other_inode) &&
-                                   PTR_ERR(other_inode) == -ENOENT) {
+                               if (other_inode == ERR_PTR(-ENOENT)) {
                                        goto next_key;
                                } else if (IS_ERR(other_inode)) {
                                        err = PTR_ERR(other_inode);