Skip to contentSkip to conversation

S390 change in sg_set_page() cause build failure

PATCH Kamalesh Babulal 2 participants 7 messages Oct 26, 2007 – Oct 29, 2007

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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.

--

drivers/s390/scsi/zfcp_def.h +3 -1
index 0754542..acf2d22 100644
@@ -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.

#1 lore raw
Quoted 26 lines · Kamalesh Babulal

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.

--

drivers/s390/scsi/zfcp_def.h +0 -0
index 0754542..acf2d22 100644
@@ -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

drivers/s390/scsi/zfcp_def.h zfcp_sg_to_address(struct scatterlist *list) · line 80

Quoted 10 lines
drivers/s390/scsi/zfcp_def.h +3 -1
  * @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:

drivers/s390/scsi/zfcp_def.h +3 -2
index 0754542..e268f79 100644
@@ -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
Signature · 1 line
Jens Axboe
#2 lore raw
Quoted 50 lines · Jens Axboe
Quoted 26 lines · Kamalesh Babulal

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.

--

drivers/s390/scsi/zfcp_def.h +0 -0
index 0754542..acf2d22 100644
@@ -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

drivers/s390/scsi/zfcp_def.h zfcp_sg_to_address(struct scatterlist *list) · line 80

Quoted 10 lines
drivers/s390/scsi/zfcp_def.h +3 -1
  * @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:

drivers/s390/scsi/zfcp_def.h +1 -0
index 0754542..e268f79 100644
@@ -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

drivers/s390/scsi/zfcp_def.h zfcp_sg_to_address(struct scatterlist *list) · line 81

Quoted 10 lines
drivers/s390/scsi/zfcp_def.h +2 -2
  */
 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.

Signature · 4 lines
Thanks & Regards,
Kamalesh Babulal,
Linux Technology Center,
IBM, ISTL.
#3 lore raw
In reply to Jens Axboe
Quoted 4 lines · Jens Axboe
Quoted 3 lines · Kamalesh Babulal

Hi Jens,

sg_set_buf(list, address, 0);

<snip>

Quoted 26 lines
Quoted 1 line

}

That's not quite right, it should be:

drivers/s390/scsi/zfcp_def.h +3 -2
index 0754542..e268f79 100644
@@ -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
Signature · 2 lines
-- 
Jens Axboe

Hi Jens,

Resending the patch with the changes pointed by you in the patch.

--

drivers/s390/scsi/zfcp_def.h +3 -2
index 0754542..f747e86 100644
@@ -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.

#4 lore raw
Quoted 49 lines · Kamalesh Babulal
Quoted 4 lines · Jens Axboe
Quoted 3 lines · Kamalesh Babulal

Hi Jens,

sg_set_buf(list, address, 0);

<snip>

Quoted 26 lines
Quoted 1 line

}

That's not quite right, it should be:

drivers/s390/scsi/zfcp_def.h +3 -2
index 0754542..e268f79 100644
@@ -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
Signature · 2 lines
-- 
Jens Axboe

Hi Jens,

Resending the patch with the changes pointed by you in the patch.

--

drivers/s390/scsi/zfcp_def.h +1 -0
index 0754542..f747e86 100644
@@ -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 

drivers/s390/scsi/zfcp_def.h zfcp_sg_to_address(struct scatterlist *list) · line 81

Quoted 10 lines
drivers/s390/scsi/zfcp_def.h +2 -2
  */
 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

Signature · 1 line
Jens Axboe
#5 lore raw
Quoted 57 lines · Jens Axboe
Quoted 56 lines · Kamalesh Babulal
Quoted 4 lines · Jens Axboe
Quoted 3 lines · Kamalesh Babulal

Hi Jens,

sg_set_buf(list, address, 0);

<snip>

Quoted 25 lines
Quoted 1 line

}

That's not quite right, it should be:

drivers/s390/scsi/zfcp_def.h +3 -2
index 0754542..e268f79 100644
@@ -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
Signature · 2 lines
-- 
Jens Axboe

Hi Jens,

Resending the patch with the changes pointed by you in the patch.

--

drivers/s390/scsi/zfcp_def.h +3 -2
index 0754542..f747e86 100644
@@ -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);
 }
 
Quoted 6 lines

drivers/s390/scsi/zfcp_def.h zfcp_sg_to_address(struct scatterlist *list) · line 81

Quoted 1 line
drivers/s390/scsi/zfcp_def.h +0 -0
 #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.

Signature · 2 lines
Thanks & Regards,
Kamalesh Babulal,
#6 lore raw
Quoted 62 lines · Kamalesh Babulal
Quoted 61 lines · Jens Axboe
Quoted 47 lines · Kamalesh Babulal
Quoted 4 lines · Jens Axboe
Quoted 3 lines · Kamalesh Babulal

Hi Jens,

sg_set_buf(list, address, 0);

<snip>

Quoted 25 lines
Quoted 1 line

}

That's not quite right, it should be:

drivers/s390/scsi/zfcp_def.h +3 -2
index 0754542..e268f79 100644
@@ -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
Signature · 2 lines
-- 
Jens Axboe

Hi Jens,

Resending the patch with the changes pointed by you in the patch.

--

drivers/s390/scsi/zfcp_def.h +1 -0
index 0754542..f747e86 100644
@@ -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 

drivers/s390/scsi/zfcp_def.h zfcp_sg_to_address(struct scatterlist *list) · line 81

Quoted 10 lines
drivers/s390/scsi/zfcp_def.h +2 -2
  */
 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:

Quoted 5 lines
Quoted 2 lines

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.

Signature · 1 line
Jens Axboe