Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
IronPort-SDR: NgewGMfHhbsv13FFAJHWDPDWip2nxp2fKY9nJVc+tT1I43uKHAstDhl/8yjztg0nN0rIK0O4T6
 CxqPorCqEgg/7EuSD0FFzMesqC0koTWJt4bKnT7jl8zBPF10MGSG9Dy7T5utG1rqOlY9HCCBDA
 EDWUWbY/i3Sc2To9ET3fcYRKXSUyJBUx68DIueP0Rgu1PiEQK7fWpoyQyb6VxjodLpOQ0CXMqz
 HYVOzUBNk3BC2ZwxNlyO426vQHlrC5ZUoFXa+cPWieEkFQpgR+w7AYY3OIv2FP8HFZVXoAJ8Df
 NvmfXQecPl1fUzBNzUb5KMMx
IronPort-SDR: 61AT1Avz4hGS11WI609/K1gFEHAbashIAMArQ2f45rFNMlsk59jzAmcdZshbma6KxCZHx2kDX1
 pCY83cHaN3a+jC+H6wojmWhmlPxL7waR3SLGQLaQbAZm8SIhg1dheF8CNPWkpseunfLLeEH7bW
 x3R0KQwq2vOuhH8OBEnem7A8COgyXLt/RgBJw6x8CgMUe+sDp7j41tY/lyACkHpj8wUdOgU+KJ
 iHcMbF/zZgvTtuFScnW5ALMYb+bekQFOKZZzX3R7dDT2cZ7tjKt4c0ehEfYWteO4bIX4iGwqzu
 /yQ=
WDCIronportException: Internal
Message-ID: <45f33e3e-c1a7-7183-bf04-83649af8ac04@opensource.wdc.com>
Date:   Thu, 13 Oct 2022 15:39:26 +0900
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0)
 Gecko/20100101 Thunderbird/102.3.2
Subject: Re: [PATCH 4.19] scsi: sd: Fix 'sdkp' in sd_first_printk
Content-Language: en-US
To:     Jason Yan <yanaijie@huawei.com>, Li kunyu <kunyu@nfschina.com>
Cc:     jejb@linux.vnet.ibm.com, linux-kernel@vger.kernel.org,
        linux-scsi@vger.kernel.org, martin.petersen@oracle.com
References: <0e67aa4d-f66e-f392-5950-31b1c90c287b@opensource.wdc.com>
 <20221013044927.278854-1-kunyu@nfschina.com>
 <badf255f-df60-fbc7-0f61-c69b99ebbaa6@huawei.com>
From:   Damien Le Moal <damien.lemoal@opensource.wdc.com>
Organization: Western Digital Research
In-Reply-To: <badf255f-df60-fbc7-0f61-c69b99ebbaa6@huawei.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 2022/10/13 15:26, Jason Yan wrote:
> 
> On 2022/10/13 12:49, Li kunyu wrote:
>>
>> This is defined in the 4.19 kernel:
>>
>> #define sd_printk(prefix, sdsk, fmt, a...)                              \
>>          (sdsk)->disk ?                                                  \
>>                sdev_prefix_printk(prefix, (sdsk)->device,                \
>>                                   (sdsk)->disk->disk_name, fmt, ##a) :   \
>>                sdev_printk(prefix, (sdsk)->device, fmt, ##a)
>>
>> #define sd_first_printk(prefix, sdsk, fmt, a...)                        \
>>          do {                                                            \
>>                  if ((sdkp)->first_scan)                                 \
>>                          sd_printk(prefix, sdsk, fmt, ##a);              \
>>          } while (0)
>>
>>
>>
>> Most of the sdsk used in the macro definition has only one sdkp.
>>
>>
>> This is defined in the v6.0-rc7 kernel:
>>
>> #define sd_printk(prefix, sdsk, fmt, a...)                              \
>>          (sdsk)->disk ?                                                  \
>>                sdev_prefix_printk(prefix, (sdsk)->device,                \
>>                                   (sdsk)->disk->disk_name, fmt, ##a) :   \
>>                sdev_printk(prefix, (sdsk)->device, fmt, ##a)
>>
>> #define sd_first_printk(prefix, sdsk, fmt, a...)                        \
>>          do {                                                            \
>>                  if ((sdsk)->first_scan)                                 \
>>                          sd_printk(prefix, sdsk, fmt, ##a);              \
>>          } while (0)
>>
>> Use sdsk in macro definition.
>>
>>
>> I did report an error when compiling sd. o in the 4.19 kernel. It was modified to say that no more errors were reported in sdsk. Can I continue the 6.0-rc7 writing method here.
>>
> 
> You should backport the mainline patch to 4.19, not create a new one.

Yes, but since the mainline patch has a typo, better fix it and backport the fix
too with a "Fixes" tag.

My point about the proposed patch was to make the reverse change to fix the
macro: use sdkp instead of sdsk since the former is used everywhere and clear.
But sure, since this is not causing any issue, no strong need to fix the macro.
It is really ugly as-is though :)

> 
> commit df46cac3f71c57e0b23f6865651629aaa54f8ca9
> Author: Dietmar Hahn <dietmar.hahn@ts.fujitsu.com>
> Date:   Tue Feb 5 11:10:48 2019 +0100
> 
>      scsi: sd: Fix typo in sd_first_printk()
> 
>      Commit b2bff6ceb61a9 ("[SCSI] sd: Quiesce mode sense error messages")
>      added the macro sd_first_printk(). The macro takes "sdsk" as argument
>      but dereferences "sdkp". This hasn't caused any real issues since all
>      callers of sd_first_printk() have an sdkp. But fix the typo.
> 
>      [mkp: Turned this into a real patch and tweaked commit description]
> 
>      Signed-off-by: Dietmar Hahn <dietmar.hahn@ts.fujitsu.com>
>      Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
> 
> diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h
> index 1080c85d97f8..5796ace76225 100644
> --- a/drivers/scsi/sd.h
> +++ b/drivers/scsi/sd.h
> @@ -132,7 +132,7 @@ static inline struct scsi_disk *scsi_disk(struct 
> gendisk *disk)
> 
>   #define sd_first_printk(prefix, sdsk, fmt, a...)                       \
>          do {                                                            \
> -               if ((sdkp)->first_scan)                                 \
> +               if ((sdsk)->first_scan)                                 \
>                          sd_printk(prefix, sdsk, fmt, ##a);              \
>          } while (0)
> 
> 
> 
>>
>> .
>>

-- 
Damien Le Moal
Western Digital Research