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

Commit 5c9a702e authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Remove unused variable in btrfs_get_extent 



trans was statically assigned to NULL and this never changed over the
course of btrfs_get_extent. So remove any code which checks whether
trans != NULL and just hardcode the fact trans is always NULL.

Resolves-coverity-id: 112806
Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 7cfad652

fs/btrfs/inode.c

+1 −8
Original line number Diff line number Diff line
@@ -6948,7 +6948,6 @@ struct extent_map *btrfs_get_extent(struct btrfs_inode *inode, 
	struct extent_map *em = NULL;

	struct extent_map_tree *em_tree = &inode->extent_tree;

	struct extent_io_tree *io_tree = &inode->io_tree;

	struct btrfs_trans_handle *trans = NULL;

	const bool new_inline = !page || create;



	read_lock(&em_tree->lock);
@@ -6989,8 +6988,7 @@ struct extent_map *btrfs_get_extent(struct btrfs_inode *inode, 
		path->reada = READA_FORWARD;

	}



	ret = btrfs_lookup_file_extent(trans, root, path,

				       objectid, start, trans != NULL);

	ret = btrfs_lookup_file_extent(NULL, root, path, objectid, start, 0);

	if (ret < 0) {

		err = ret;

		goto out;
@@ -7186,11 +7184,6 @@ struct extent_map *btrfs_get_extent(struct btrfs_inode *inode, 
	trace_btrfs_get_extent(root, inode, em);



	btrfs_free_path(path);

	if (trans) {

		ret = btrfs_end_transaction(trans);

		if (!err)

			err = ret;

	}

	if (err) {

		free_extent_map(em);

		return ERR_PTR(err);