Skip to contentSkip to conversation

sr: Fix a recently introduced W=1 compiler warning

PATCH In review Bart Van Assche 3 participants 3 messages Mar 30, 2020 SCSI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sr: Fix a recently introduced W=1 compiler warning

Fix the following compiler warning:

drivers/scsi/sr.c:686:12: warning: initialized field overwritten [-Woverride-init]
686 | .ioctl = sr_block_compat_ioctl,

      |            ^~~~~~~~~~~~~~~~~~~~~

drivers/scsi/sr.c:686:12: note: (near initialization for 'sr_bdops.ioctl')

Cc Arnd Bergmann <[email protected]>
Fixes d320a9551e39 ("compat_ioctl: scsi: move ioctl handling into drivers")
---
 drivers/scsi/sr.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/scsi/sr.c +5 -4
index fe0e1c721a99..9ad57a98a37f 100644
@@ -556,6 +556,7 @@ static void sr_block_release(struct gendisk *disk, fmode_t mode)
 	mutex_unlock(&cd->lock);
 }
 
+#ifndef CONFIG_COMPAT
 static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
 			  unsigned long arg)
 {
@@ -597,8 +598,7 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
 	mutex_unlock(&cd->lock);
 	return ret;
 }
-
-#ifdef CONFIG_COMPAT
+#else /* !defined(CONFIG_COMPAT) */
 static int sr_block_compat_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
 			  unsigned long arg)
 {
@@ -641,7 +641,7 @@ static int sr_block_compat_ioctl(struct block_device *bdev, fmode_t mode, unsign
 	return ret;
 
 }
-#endif
+#endif /* !defined(CONFIG_COMPAT) */
 
 static unsigned int sr_block_check_events(struct gendisk *disk,
 					  unsigned int clearing)
@@ -685,8 +685,9 @@ static const struct block_device_operations sr_bdops =
 	.owner		= THIS_MODULE,
 	.open		= sr_block_open,
 	.release	= sr_block_release,
+#ifndef CONFIG_COMPAT
 	.ioctl		= sr_block_ioctl,
-#ifdef CONFIG_COMPAT
+#else
 	.ioctl		= sr_block_compat_ioctl,
 #endif
 	.check_events	= sr_block_check_events,
#1 lore raw

drivers/scsi/sr.c static const struct block_device_operations sr_bdops = · line 691

Quoted 12 lines · Bart Van Assche

static unsigned int sr_block_check_events(struct gendisk *disk,

drivers/scsi/sr.c +0 -0
 					  unsigned int clearing)
@@ -685,8 +685,9 @@ static const struct block_device_operations

sr_bdops =

drivers/scsi/sr.c +2 -1
 	.owner		= THIS_MODULE,
 	.open		= sr_block_open,
 	.release	= sr_block_release,
+#ifndef CONFIG_COMPAT
 	.ioctl		= sr_block_ioctl,
-#ifdef CONFIG_COMPAT
+#else
 	.ioctl		= sr_block_compat_ioctl,

Well, this is obviously incorrect: we need the compat ioctl for 32 on 64 bit and the real for native 64 bit, so both have to be defined. What you propose would work if we were only ever 32 on 64. I think what you want to do is change the second .ioctl to .compat_ioctl.

James

#2 lore raw
Quoted 11 lines · James Bottomley
Quoted 9 lines · Bart Van Assche

static unsigned int sr_block_check_events(struct gendisk *disk,
unsigned int clearing)

(quoted diff) +0 -0
@@ -685,8 +685,9 @@ static const struct block_device_operations

sr_bdops =

      .owner          = THIS_MODULE,
      .open           = sr_block_open,
      .release        = sr_block_release,

+#ifndef CONFIG_COMPAT
.ioctl = sr_block_ioctl,

Quoted 8 lines

drivers/scsi/sr.c static const struct block_device_operations sr_bdops = · line 691

Quoted 3 lines
drivers/scsi/sr.c +1 -1
-#ifdef CONFIG_COMPAT
+#else
      .ioctl          = sr_block_compat_ioctl,

Well, this is obviously incorrect: we need the compat ioctl for 32 on 64 bit and the real for native 64 bit, so both have to be defined. What you propose would work if we were only ever 32 on 64. I think what you want to do is change the second .ioctl to .compat_ioctl.

The correct fix was merged into v5.6-rc4, see commit 03264ddde245 ("scsi:
compat_ioctl: cdrom: Replace .ioctl with .compat_ioctl in four appropriate places").

Arnd