Skip to contentSkip to conversation

swim3: fix the floppy_locked_ioctl prototype

PATCH Applied Christoph Hellwig 3 participants 3 messages Jun 13, 2023 Block layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 swim3: fix the floppy_locked_ioctl prototype

Add back the accidentally dropped mode parameter.

Fixes b60f7635788a ("swim3: fix the floppy_locked_ioctl prototype")
---
 drivers/block/swim3.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/swim3.c +1 -1
index 945a0315425070..dc43a63b346946 100644
@@ -882,7 +882,7 @@ static int fd_eject(struct floppy_state *fs)
 static struct floppy_struct floppy_type =
 	{ 2880,18,2,80,0,0x1B,0x00,0xCF,0x6C,NULL };	/*  7 1.44MB 3.5"   */
 
-static int floppy_locked_ioctl(struct block_device *bdev,
+static int floppy_locked_ioctl(struct block_device *bdev, blk_mode_t mode,
 			unsigned int cmd, unsigned long param)
 {
 	struct floppy_state *fs = bdev->bd_disk->private_data;
Signature · 1 line
2.39.2
maintainer Applied
#1 lore raw
Quoted 3 lines · Christoph Hellwig

Add back the accidentally dropped mode parameter.

Applied, thanks!

[1/1] swim3: fix the floppy_locked_ioctl prototype

      commit: 3dbd53c7be1c3dd04875a0672262b56417039869

Best regards,

Signature · 1 line
Jens Axboe
Acked-by Tested-by on v1 1/1
#2 lore raw
In reply to Christoph Hellwig
Quoted 5 lines · Christoph Hellwig

Add back the accidentally dropped mode parameter.

Fixes b60f7635788a ("swim3: fix the floppy_locked_ioctl prototype")

Thanks.

Quoted 17 lines
---
 drivers/block/swim3.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/swim3.c +1 -1
index 945a0315425070..dc43a63b346946 100644
@@ -882,7 +882,7 @@ static int fd_eject(struct floppy_state *fs)
 static struct floppy_struct floppy_type =
 	{ 2880,18,2,80,0,0x1B,0x00,0xCF,0x6C,NULL };	/*  7 1.44MB 3.5"   */
 
-static int floppy_locked_ioctl(struct block_device *bdev,
+static int floppy_locked_ioctl(struct block_device *bdev, blk_mode_t mode,
 			unsigned int cmd, unsigned long param)
 {
 	struct floppy_state *fs = bdev->bd_disk->private_data;
Signature · 1 line
~Randy