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

Commit 4cb89420 authored by Su Yue's avatar Su Yue Committed by Greg Kroah-Hartman
Browse files

btrfs: return error value if create_io_em failed in cow_file_range 



commit 090a127a upstream.

In cow_file_range(), create_io_em() may fail, but its return value is
not recorded.  Then return value may be 0 even it failed which is a
wrong behavior.

Let cow_file_range() return PTR_ERR(em) if create_io_em() failed.

Fixes: 6f9994db ("Btrfs: create a helper to create em for IO")
CC: stable@vger.kernel.org # 4.11+
Signed-off-by: default avatarSu Yue <suy.fnst@cn.fujitsu.com>
Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5f7e3b5b

fs/btrfs/inode.c

+3 −1
Original line number Diff line number Diff line
@@ -1027,8 +1027,10 @@ static noinline int cow_file_range(struct inode *inode, 
				  ram_size, /* ram_bytes */

				  BTRFS_COMPRESS_NONE, /* compress_type */

				  BTRFS_ORDERED_REGULAR /* type */);

		if (IS_ERR(em))

		if (IS_ERR(em)) {

			ret = PTR_ERR(em);

			goto out_reserve;

		}

		free_extent_map(em);



		ret = btrfs_add_ordered_extent(inode, start, ins.objectid,