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

Commit 8d9e220c authored by Al Viro's avatar Al Viro Committed by David Sterba
Browse files

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: default avatarAl Viro <viro@zeniv.linux.org.uk>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
[ update changelog ]
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 2e19f1f9

fs/btrfs/transaction.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

fs/btrfs/tree-log.c

+2 −3
Original line number Diff line number Diff line
@@ -2181,7 +2181,7 @@ static noinline int check_item_in_log(struct btrfs_trans_handle *trans, 
						     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 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans, 
				 * 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);