Commit 2342d659 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

btrfs: fix warning on PTR_ERR() against NULL device at btrfs_control_ioctl() 



Smatch complains about calling PTR_ERR() against a NULL pointer:

  fs/btrfs/super.c:2272 btrfs_control_ioctl() warn: passing zero to 'PTR_ERR'

Fix this by calling PTR_ERR() against the device pointer only if it
contains an error.

Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 80b36955

fs/btrfs/super.c

+4 −1
Original line number Diff line number Diff line
@@ -2254,7 +2254,10 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd, 
		device = btrfs_scan_one_device(vol->name, BLK_OPEN_READ, false);

		if (IS_ERR_OR_NULL(device)) {

			mutex_unlock(&uuid_mutex);

			if (IS_ERR(device))

				ret = PTR_ERR(device);

			else

				ret = 0;

			break;

		}

		ret = !(device->fs_devices->num_devices ==