Commit 8e2ab5a4 authored Apr 11, 2018 by Finn Thain Committed by Jens Axboe Apr 16, 2018

block/swim: Don't log an error message for an invalid ioctl



The 'eject' shell command may send various different ioctl commands.
This leads to error messages on the console even though the FDEJECT
ioctl succeeds.

~# eject floppy
SWIM floppy_ioctl: unknown cmd 21257
SWIM floppy_ioctl: unknown cmd 1

Don't log an error message for an invalid ioctl, just do as the
swim3 driver does and return -ENOTTY.

Cc: Laurent Vivier <lvivier@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: stable@vger.kernel.org # v4.14+
Tested-by: Stan Johnson <userm57@yahoo.com>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Acked-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent c1d6207c

drivers/block/swim.c

+2 −7

Original line number	Diff line number	Diff line
		@@ -727,15 +727,10 @@ static int floppy_ioctl(struct block_device *bdev, fmode_t mode,
		if (copy_to_user((void __user ) param, (void ) &floppy_type,
		sizeof(struct floppy_struct)))
		return -EFAULT;
		break;

		default:
		printk(KERN_DEBUG "SWIM floppy_ioctl: unknown cmd %d\n",
		cmd);
		return -ENOSYS;
		}
		return 0;
		}
		return -ENOTTY;
		}

		static int floppy_getgeo(struct block_device bdev, struct hd_geometry geo)
		{

Admin message