scsi: sd: Move the sd_fops definition

Move the sd_fops definition such that the sd_unlock_native_capacity()
forward declaration can be removed.

Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Link: https://patch.msgid.link/20260114175054.4118163-5-bvanassche@acm.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 0d07f37342577e94f914a7370579c6458e48ef4c..1dae8a02c446e440aaf405d909d02aee87135847 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -105,7 +105,6 @@ MODULE_ALIAS_SCSI_DEVICE(TYPE_ZBC);
 static void sd_config_write_same(struct scsi_disk *sdkp,
                struct queue_limits *lim);
 static void  sd_revalidate_disk(struct gendisk *);
-static void sd_unlock_native_capacity(struct gendisk *disk);
 
 static DEFINE_IDA(sd_index_ida);
 
@@ -2184,21 +2183,6 @@ static void scsi_disk_free_disk(struct gendisk *disk)
        put_device(&sdkp->disk_dev);
 }
 
-static const struct block_device_operations sd_fops = {
-       .owner                  = THIS_MODULE,
-       .open                   = sd_open,
-       .release                = sd_release,
-       .ioctl                  = sd_ioctl,
-       .getgeo                 = sd_getgeo,
-       .compat_ioctl           = blkdev_compat_ptr_ioctl,
-       .check_events           = sd_check_events,
-       .unlock_native_capacity = sd_unlock_native_capacity,
-       .report_zones           = sd_zbc_report_zones,
-       .get_unique_id          = sd_get_unique_id,
-       .free_disk              = scsi_disk_free_disk,
-       .pr_ops                 = &sd_pr_ops,
-};
-
 /**
  *     sd_eh_reset - reset error handling callback
  *     @scmd:          sd-issued command that has failed
@@ -3892,6 +3876,21 @@ static void sd_unlock_native_capacity(struct gendisk *disk)
                sdev->host->hostt->unlock_native_capacity(sdev);
 }
 
+static const struct block_device_operations sd_fops = {
+       .owner                  = THIS_MODULE,
+       .open                   = sd_open,
+       .release                = sd_release,
+       .ioctl                  = sd_ioctl,
+       .getgeo                 = sd_getgeo,
+       .compat_ioctl           = blkdev_compat_ptr_ioctl,
+       .check_events           = sd_check_events,
+       .unlock_native_capacity = sd_unlock_native_capacity,
+       .report_zones           = sd_zbc_report_zones,
+       .get_unique_id          = sd_get_unique_id,
+       .free_disk              = scsi_disk_free_disk,
+       .pr_ops                 = &sd_pr_ops,
+};
+
 /**
  *     sd_format_disk_name - format disk name
  *     @prefix: name prefix - ie. "sd" for SCSI disks