From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ingo Molnar Subject: [build fix] Re: [GIT PATCH] SCSI part 1 Date: Wed, 16 Jul 2008 12:16:34 +0200 Message-ID: <20080716101634.GA8494@elte.hu> References: <1216138543.3312.60.camel@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from mx2.mail.elte.hu ([157.181.151.9]:34387 "EHLO mx2.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755587AbYGPKQt (ORCPT ); Wed, 16 Jul 2008 06:16:49 -0400 Content-Disposition: inline In-Reply-To: <1216138543.3312.60.camel@localhost.localdomain> Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: James Bottomley Cc: Andrew Morton , Linus Torvalds , linux-scsi , linux-kernel * James Bottomley wrote: > zfcp: Move status accessors from zfcp to SCSI include file. -tip testing found that the upstream build broke in fs/compat_ioctl.c: -----------> In file included from include/scsi/scsi.h:12, from fs/compat_ioctl.c:72: include/scsi/scsi_cmnd.h:27:25: warning: "BLK_MAX_CDB" is not defined include/scsi/scsi_cmnd.h:28:3: error: #error MAX_COMMAND_SIZE can not b= e bigger than BLK_MAX_CDB In file included from include/scsi/scsi.h:12, from fs/compat_ioctl.c:72: include/scsi/scsi_cmnd.h: In function =E2=80=98scsi_bidi_cmnd=E2=80=99: include/scsi/scsi_cmnd.h:182: error: implicit declaration of function =E2= =80=98blk_bidi_rq=E2=80=99 include/scsi/scsi_cmnd.h:183: error: dereferencing pointer to incomplet= e type include/scsi/scsi_cmnd.h: In function =E2=80=98scsi_in=E2=80=99: include/scsi/scsi_cmnd.h:189: error: dereferencing pointer to incomplet= e type <----------- with this config: http://redhat.com/~mingo/misc/config-Wed_Jul_16_11_32_32_CEST_2008.ba= d I have bisected it down to: | feac6a07c4a3578bffd6769bb4927e8a7e1f3ffe is first bad commit | commit feac6a07c4a3578bffd6769bb4927e8a7e1f3ffe | Author: Martin Petermann | Date: Wed Jul 2 10:56:35 2008 +0200 | | [SCSI] zfcp: Move status accessors from zfcp to SCSI include file. | | Move the accessor functions for the scsi_cmnd status from zfcp to = the | SCSI include file. Change the interface to the functions to pass t= he | scsi_cmnd pointer instead of the status pointer. | | Signed-off-by: Martin Petermann | Signed-off-by: Christof Schmitt | Signed-off-by: James Bottomley It was not possible to do a clean revert of that change because other=20 zfcp changes were layered upon it. The problem is this aspect of that change: | @@ -9,6 +9,7 @@ | #define _SCSI_SCSI_H | | #include | +#include | | /* | * The maximum number of SG segments that we will put inside a scsi_cmnd.h depends on symbols defined in blkdev.h. The fix is to=20 include blkdev.h as well. The commit below (in tip/out-of-tree) fixes this bug. Ingo --------------> commit 878dfa069329bb302449272ad020ae6f449f693e Author: Ingo Molnar Date: Wed Jul 16 11:56:08 2008 +0200 scsi: fix build error in fs/compat_ioctl.c =20 -tip testing found that the build broke in fs/compat_ioctl.c: =20 -----------> In file included from include/scsi/scsi.h:12, from fs/compat_ioctl.c:72: include/scsi/scsi_cmnd.h:27:25: warning: "BLK_MAX_CDB" is not defin= ed include/scsi/scsi_cmnd.h:28:3: error: #error MAX_COMMAND_SIZE can n= ot be bigger than BLK_MAX_CDB In file included from include/scsi/scsi.h:12, from fs/compat_ioctl.c:72: include/scsi/scsi_cmnd.h: In function =E2=80=98scsi_bidi_cmnd=E2=80= =99: include/scsi/scsi_cmnd.h:182: error: implicit declaration of functi= on =E2=80=98blk_bidi_rq=E2=80=99 include/scsi/scsi_cmnd.h:183: error: dereferencing pointer to incom= plete type include/scsi/scsi_cmnd.h: In function =E2=80=98scsi_in=E2=80=99: include/scsi/scsi_cmnd.h:189: error: dereferencing pointer to incom= plete type <----------- =20 with this config: =20 http://redhat.com/~mingo/misc/config-Wed_Jul_16_11_32_32_CEST_200= 8.bad =20 I have bisected it down to: =20 | feac6a07c4a3578bffd6769bb4927e8a7e1f3ffe is first bad commit | commit feac6a07c4a3578bffd6769bb4927e8a7e1f3ffe | Author: Martin Petermann | Date: Wed Jul 2 10:56:35 2008 +0200 | | [SCSI] zfcp: Move status accessors from zfcp to SCSI include f= ile. | | Move the accessor functions for the scsi_cmnd status from zfcp= to the | SCSI include file. Change the interface to the functions to pa= ss the | scsi_cmnd pointer instead of the status pointer. | | Signed-off-by: Martin Petermann | Signed-off-by: Christof Schmitt | Signed-off-by: James Bottomley =20 The problem is due to this aspect of that change: =20 | @@ -9,6 +9,7 @@ | #define _SCSI_SCSI_H | | #include | +#include | | /* | * The maximum number of SG segments that we will put inside a =20 scsi_cmnd.h depends on symbols defined in blkdev.h. The fix is to include blkdev.h as well. =20 Signed-off-by: Ingo Molnar --- include/scsi/scsi.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h index 00137a7..2ef4a91 100644 --- a/include/scsi/scsi.h +++ b/include/scsi/scsi.h @@ -9,6 +9,7 @@ #define _SCSI_SCSI_H =20 #include +#include #include =20 /* -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" i= n the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html