Re: S390 change in sg_set_page() cause build failure

[Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>]

Jens Axboe wrote:
> On Fri, Oct 26 2007, Kamalesh Babulal wrote:
>> Hi Jens,
>>
>> The change in the sg_set_page() for the S390, cause the build failure
>>
>> drivers/s390/scsi/zfcp_aux.c: In function `zfcp_sg_list_alloc':
>> drivers/s390/scsi/zfcp_aux.c:572: error: too many arguments to function `zfcp_address_to_sg'
>> drivers/s390/scsi/zfcp_aux.c: In function `zfcp_gid_pn_buffers_alloc':
>> drivers/s390/scsi/zfcp_aux.c:1524: error: too many arguments to function `zfcp_address_to_sg'
>> drivers/s390/scsi/zfcp_aux.c:1525: error: too many arguments to function `zfcp_address_to_sg'
>> make[2]: *** [drivers/s390/scsi/zfcp_aux.o] Error 1
>> make[1]: *** [drivers/s390/scsi] Error 2
>> make: *** [drivers/s390] Error 2
>>
>> The commit 642f149031d70415d9318b919d50b71e4724adbd causes this build
>> failure, in the drivers/s390/scsi/zfcp_def.h include file, the function
>> zfcp_address_to_sg the len of the scatterlist missing.
>>
>> Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
>> --
>> diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h
>> index 0754542..acf2d22 100644
>> --- a/drivers/s390/scsi/zfcp_def.h
>> +++ b/drivers/s390/scsi/zfcp_def.h
>> @@ -70,9 +70,11 @@ zfcp_sg_to_address(struct scatterlist *list)
>>   * zfcp_address_to_sg - set up struct scatterlist from kernel address
>>   * @address: kernel address
>>   * @list: struct scatterlist
>> + * @list_size: size of the list - used for compatibility 
>>   */
>>  static inline void
>> -zfcp_address_to_sg(void *address, struct scatterlist *list)
>> +zfcp_address_to_sg(void *address, struct scatterlist *list,
>> +                   unsigned int list_size)
>>  {
>>  	sg_set_buf(list, address, 0);
>>  }
> 
> That's not quite right, it should be:
> 
> diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h
> index 0754542..e268f79 100644
> --- a/drivers/s390/scsi/zfcp_def.h
> +++ b/drivers/s390/scsi/zfcp_def.h
> @@ -70,11 +70,12 @@ zfcp_sg_to_address(struct scatterlist *list)
>   * zfcp_address_to_sg - set up struct scatterlist from kernel address
>   * @address: kernel address
>   * @list: struct scatterlist
> + * @size: buffer size
>   */
>  static inline void
> -zfcp_address_to_sg(void *address, struct scatterlist *list)
> +zfcp_address_to_sg(void *address, struct scatterlist *list, unsigned int size)
>  {
> -	sg_set_buf(list, address, 0);
> +	sg_set_buf(list, address, size);
>  }
> 
>  #define REQUEST_LIST_SIZE 128
> 
Hi Jens,

Thanks for fixing it.

-- 
Thanks & Regards,
Kamalesh Babulal,
Linux Technology Center,
IBM, ISTL.