* S390 change in sg_set_page() cause build failure
@ 2007-10-26 11:19 Kamalesh Babulal
2007-10-26 11:54 ` Jens Axboe
0 siblings, 1 reply; 7+ messages in thread
From: Kamalesh Babulal @ 2007-10-26 11:19 UTC (permalink / raw)
To: jens.axboe; +Cc: linux-kernel, torvalds, akpm, linux-s390
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);
}
--
Thanks & Regards,
Kamalesh Babulal,
Linux Technology Center,
IBM,ISTL.
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: S390 change in sg_set_page() cause build failure
2007-10-26 11:19 S390 change in sg_set_page() cause build failure Kamalesh Babulal
@ 2007-10-26 11:54 ` Jens Axboe
2007-10-26 14:35 ` Kamalesh Babulal
2007-10-29 11:22 ` [PATCH-RESEND] " Kamalesh Babulal
0 siblings, 2 replies; 7+ messages in thread
From: Jens Axboe @ 2007-10-26 11:54 UTC (permalink / raw)
To: Kamalesh Babulal; +Cc: linux-kernel, torvalds, akpm, linux-s390
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
--
Jens Axboe
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: S390 change in sg_set_page() cause build failure
2007-10-26 11:54 ` Jens Axboe
@ 2007-10-26 14:35 ` Kamalesh Babulal
2007-10-29 11:22 ` [PATCH-RESEND] " Kamalesh Babulal
1 sibling, 0 replies; 7+ messages in thread
From: Kamalesh Babulal @ 2007-10-26 14:35 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-kernel, torvalds, akpm, linux-s390
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.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH-RESEND] Re: S390 change in sg_set_page() cause build failure
2007-10-26 11:54 ` Jens Axboe
2007-10-26 14:35 ` Kamalesh Babulal
@ 2007-10-29 11:22 ` Kamalesh Babulal
2007-10-29 11:26 ` Jens Axboe
1 sibling, 1 reply; 7+ messages in thread
From: Kamalesh Babulal @ 2007-10-29 11:22 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-kernel, torvalds, akpm, linux-s390
On Fri, Oct 26, 2007 at 01:54:30PM +0200, Jens Axboe wrote:
> On Fri, Oct 26 2007, Kamalesh Babulal wrote:
> > Hi Jens,
> >
> > sg_set_buf(list, address, 0);
<snip>
> > }
>
> 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
>
> --
> Jens Axboe
Hi Jens,
Resending the patch with the changes pointed by you in the patch.
[jens.axboe@oracle.com: size parameter fix]
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..f747e86 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
--
Thanks & Regards,
Kamalesh Babulal,
Linux Technology Center,
IBM,ISTL.
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH-RESEND] Re: S390 change in sg_set_page() cause build failure
2007-10-29 11:22 ` [PATCH-RESEND] " Kamalesh Babulal
@ 2007-10-29 11:26 ` Jens Axboe
2007-10-29 11:33 ` Kamalesh Babulal
0 siblings, 1 reply; 7+ messages in thread
From: Jens Axboe @ 2007-10-29 11:26 UTC (permalink / raw)
To: Kamalesh Babulal; +Cc: linux-kernel, torvalds, akpm, linux-s390
On Mon, Oct 29 2007, Kamalesh Babulal wrote:
> On Fri, Oct 26, 2007 at 01:54:30PM +0200, Jens Axboe wrote:
> > On Fri, Oct 26 2007, Kamalesh Babulal wrote:
> > > Hi Jens,
> > >
> > > sg_set_buf(list, address, 0);
> <snip>
> > > }
> >
> > 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
> >
> > --
> > Jens Axboe
>
> Hi Jens,
>
> Resending the patch with the changes pointed by you in the patch.
>
> [jens.axboe@oracle.com: size parameter fix]
> 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..f747e86 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
Thanks Kamalesh, but I already merged a fixed up version on friday:
http://git.kernel.dk/?p=linux-2.6-block.git;a=commit;h=9335432959111c982c74177521305e6a3fb600a3
--
Jens Axboe
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH-RESEND] Re: S390 change in sg_set_page() cause build failure
2007-10-29 11:26 ` Jens Axboe
@ 2007-10-29 11:33 ` Kamalesh Babulal
2007-10-29 11:34 ` Jens Axboe
0 siblings, 1 reply; 7+ messages in thread
From: Kamalesh Babulal @ 2007-10-29 11:33 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-kernel, torvalds, akpm, linux-s390
Jens Axboe wrote:
> On Mon, Oct 29 2007, Kamalesh Babulal wrote:
>> On Fri, Oct 26, 2007 at 01:54:30PM +0200, Jens Axboe wrote:
>>> On Fri, Oct 26 2007, Kamalesh Babulal wrote:
>>>> Hi Jens,
>>>>
>>>> sg_set_buf(list, address, 0);
>> <snip>
>>>> }
>>> 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
>>>
>>> --
>>> Jens Axboe
>> Hi Jens,
>>
>> Resending the patch with the changes pointed by you in the patch.
>>
>> [jens.axboe@oracle.com: size parameter fix]
>> 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..f747e86 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
>
> Thanks Kamalesh, but I already merged a fixed up version on friday:
>
> http://git.kernel.dk/?p=linux-2.6-block.git;a=commit;h=9335432959111c982c74177521305e6a3fb600a3
>
Hi Jens,
Thanks !! I resend because, this was seen till todays 2.6.24-rc1-git5.
--
Thanks & Regards,
Kamalesh Babulal,
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH-RESEND] Re: S390 change in sg_set_page() cause build failure
2007-10-29 11:33 ` Kamalesh Babulal
@ 2007-10-29 11:34 ` Jens Axboe
0 siblings, 0 replies; 7+ messages in thread
From: Jens Axboe @ 2007-10-29 11:34 UTC (permalink / raw)
To: Kamalesh Babulal; +Cc: linux-kernel, torvalds, akpm, linux-s390
On Mon, Oct 29 2007, Kamalesh Babulal wrote:
> Jens Axboe wrote:
> > On Mon, Oct 29 2007, Kamalesh Babulal wrote:
> >> On Fri, Oct 26, 2007 at 01:54:30PM +0200, Jens Axboe wrote:
> >>> On Fri, Oct 26 2007, Kamalesh Babulal wrote:
> >>>> Hi Jens,
> >>>>
> >>>> sg_set_buf(list, address, 0);
> >> <snip>
> >>>> }
> >>> 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
> >>>
> >>> --
> >>> Jens Axboe
> >> Hi Jens,
> >>
> >> Resending the patch with the changes pointed by you in the patch.
> >>
> >> [jens.axboe@oracle.com: size parameter fix]
> >> 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..f747e86 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
> >
> > Thanks Kamalesh, but I already merged a fixed up version on friday:
> >
> > http://git.kernel.dk/?p=linux-2.6-block.git;a=commit;h=9335432959111c982c74177521305e6a3fb600a3
> >
> Hi Jens,
>
> Thanks !! I resend because, this was seen till todays 2.6.24-rc1-git5.
I've sent the pull request to Linus this morning, so hopefully it should
be fixed in tomrrows snapshot.
--
Jens Axboe
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2007-10-29 11:37 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-26 11:19 S390 change in sg_set_page() cause build failure Kamalesh Babulal
2007-10-26 11:54 ` Jens Axboe
2007-10-26 14:35 ` Kamalesh Babulal
2007-10-29 11:22 ` [PATCH-RESEND] " Kamalesh Babulal
2007-10-29 11:26 ` Jens Axboe
2007-10-29 11:33 ` Kamalesh Babulal
2007-10-29 11:34 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox