All of lore.kernel.org
 help / color / mirror / Atom feed
From: Finn Thain <fthain@telegraphics.com.au>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Laurent Vivier <lvivier@redhat.com>, Jens Axboe <axboe@kernel.dk>,
	linux-m68k@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 08/12] block/swim: Don't log an error message for an invalid ioctl
Date: Sat, 31 Mar 2018 21:41:05 -0400 (EDT)	[thread overview]
Message-ID: <803fabab1f0349bafe52b5589eff3edc077eee2d.1522546571.git.fthain@telegraphics.com.au> (raw)
In-Reply-To: <cover.1522546571.git.fthain@telegraphics.com.au>

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>
Tested-by: Stan Johnson <userm57@yahoo.com>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
---
 drivers/block/swim.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/block/swim.c b/drivers/block/swim.c
index 19d7d27468c7..8be0d92bc431 100644
--- a/drivers/block/swim.c
+++ b/drivers/block/swim.c
@@ -739,14 +739,9 @@ 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 0;
+	return -ENOTTY;
 }
 
 static int floppy_getgeo(struct block_device *bdev, struct hd_geometry *geo)
-- 
2.16.1

  parent reply	other threads:[~2018-04-01  1:42 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-01  1:41 [PATCH 00/12] SWIM driver fixes Finn Thain
2018-04-01  1:41 ` [PATCH 04/12] m68k/mac: Place ISM IOP in bypass mode Finn Thain
2018-04-05  1:33   ` Sasha Levin
2018-04-01  1:41 ` [PATCH 02/12] m68k/mac: Fix SWIM memory resource end address Finn Thain
2018-04-05  1:33   ` Sasha Levin
2018-04-09 12:51   ` Geert Uytterhoeven
2018-04-01  1:41 ` [PATCH 03/12] m68k/mac: Don't remap SWIM MMIO region Finn Thain
2018-04-05  1:33   ` Sasha Levin
2018-04-09 12:54   ` Geert Uytterhoeven
2018-04-09 15:17     ` Luc Van Oostenryck
2018-04-10  1:35     ` Finn Thain
2018-04-10  2:38     ` Michael Schmitz
2018-04-01  1:41 ` [PATCH 01/12] m68k/mac: Revisit floppy disc controller base addresses Finn Thain
2018-04-05  1:33   ` Sasha Levin
2018-04-01  1:41 ` [PATCH 10/12] block/swim: Check drive type Finn Thain
2018-04-05  1:33   ` Sasha Levin
2018-04-01  1:41 ` [PATCH 11/12] block/swim: Fix IO error at end of medium Finn Thain
2018-04-05  1:33   ` Sasha Levin
2018-04-01  1:41 ` [PATCH 07/12] block/swim: Remove extra put_disk() call from error path Finn Thain
2018-04-05  1:33   ` Sasha Levin
2018-04-09 13:11   ` Geert Uytterhoeven
2018-04-01  1:41 ` [PATCH 12/12] block/swim: Select appropriate drive on device open Finn Thain
2018-04-05  1:33   ` Sasha Levin
2018-04-01  1:41 ` Finn Thain [this message]
2018-04-05  1:33   ` [PATCH 08/12] block/swim: Don't log an error message for an invalid ioctl Sasha Levin
2018-04-09 13:14   ` Geert Uytterhoeven
2018-04-10  1:27     ` Finn Thain
2018-04-01  1:41 ` [PATCH 09/12] block/swim: Rename macros to avoid inconsistent inverted logic Finn Thain
2018-04-01  1:41   ` Finn Thain
2018-04-01  1:41 ` [PATCH 05/12] block/swim: Use HEDSEL bit in ISM mode register Finn Thain
2018-04-05  1:33   ` Sasha Levin
2018-04-01  1:41 ` [PATCH 06/12] block/swim: Fix array bounds check Finn Thain
2018-04-05  1:33   ` Sasha Levin
2018-04-09 13:08   ` Geert Uytterhoeven
2018-04-10  1:10     ` Finn Thain
2018-04-03 19:07 ` [PATCH 00/12] SWIM driver fixes Laurent Vivier
2018-04-03 22:53   ` Finn Thain
2018-04-03 23:32 ` Jens Axboe
2018-04-03 23:33   ` Jens Axboe
2018-04-05  1:33 ` Sasha Levin
2018-04-05  6:30   ` Greg KH
2018-04-05  6:40     ` Sasha Levin
2018-04-05  6:51       ` Greg KH
2018-04-07  0:14   ` Finn Thain

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=803fabab1f0349bafe52b5589eff3edc077eee2d.1522546571.git.fthain@telegraphics.com.au \
    --to=fthain@telegraphics.com.au \
    --cc=axboe@kernel.dk \
    --cc=geert@linux-m68k.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-m68k@vger.kernel.org \
    --cc=lvivier@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.