Re: [PATCH AUTOSEL 4.19 2/2] btrfs: fix warning on PTR_ERR() against NULL device at btrfs_control_ioctl()

Hi!

From: Filipe Manana fdmanana@suse.com

[ Upstream commit 2342d6595b608eec94187a17dc112dd4c2a812fa ]

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.

This patch was wrongly ported to 4.19. It is not needed there. Same test is already performed 2 lines above.

Please drop.

BR, Pavel

+++ b/fs/btrfs/super.c @@ -2283,7 +2283,10 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd, &btrfs_root_fs_type); if (IS_ERR(device)) { mutex_unlock(&uuid_mutex);

• 	ret = PTR_ERR(device);
  

• 	if (IS_ERR(device))
  

• 		ret = PTR_ERR(device);
  

• 	else
  

• 		ret = 0;
  break;
  

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