From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757943AbXJZL4d (ORCPT ); Fri, 26 Oct 2007 07:56:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752340AbXJZL4Z (ORCPT ); Fri, 26 Oct 2007 07:56:25 -0400 Received: from brick.kernel.dk ([87.55.233.238]:29735 "EHLO kernel.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751473AbXJZL4Z (ORCPT ); Fri, 26 Oct 2007 07:56:25 -0400 Date: Fri, 26 Oct 2007 13:54:30 +0200 From: Jens Axboe To: Kamalesh Babulal Cc: linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, linux-s390@vger.kernel.org Subject: Re: S390 change in sg_set_page() cause build failure Message-ID: <20071026115429.GH5155@kernel.dk> References: <20071026111945.GB21274@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20071026111945.GB21274@linux.vnet.ibm.com> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org 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 > -- > 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