Skip to contentSkip to conversation

fs/compat_ioctl.c: fix build error when !BLOCK

PATCH In review Alexander Beregalov 3 participants 4 messages Dec 20, 2009 – Dec 21, 2009 VFS

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fs/compat_ioctl.c: fix build error when !BLOCK

Fix this build error when CONFIG_BLOCK is not set. fs/compat_ioctl.c:1604: error: 'SG_SET_TRANSFORM' undeclared

---
 fs/compat_ioctl.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
fs/compat_ioctl.c +2 -0
index 14cbc83..e4d4765 100644
@@ -1600,8 +1600,10 @@ static long do_ioctl_trans(int fd, unsigned int cmd,
 	case KDSKBMETA:
 	case KDSKBLED:
 	case KDSETLED:
+#ifdef CONFIG_BLOCK	
 	/* SG stuff */
 	case SG_SET_TRANSFORM:
+#endif
 	/* AUTOFS */
 	case AUTOFS_IOC_READY:
 	case AUTOFS_IOC_FAIL:
Signature · 1 line
1.6.6.rc3
maintainer
#1 lore raw
Quoted 2 lines · Alexander Beregalov

Fix this build error when CONFIG_BLOCK is not set. fs/compat_ioctl.c:1604: error: 'SG_SET_TRANSFORM' undeclared

Do you want that through VFS tree? I'm going to send a bunch of assorted fixes tomorrow morning, so I can pass that one at the same time...

#2 lore raw

2009/12/21 Al Viro <[email protected]>:

Quoted 6 lines · Alexander Beregalov
Quoted 2 lines

Fix this build error when CONFIG_BLOCK is not set. fs/compat_ioctl.c:1604: error: 'SG_SET_TRANSFORM' undeclared

Do you want that through VFS tree?  I'm going to send a bunch of assorted fixes tomorrow morning, so I can pass that one at the same time...

Yes, please.

#3 lore raw

No driver uses SG_SET_TRANSFORM any more in Linux, since the ide-scsi driver was removed in 2.6.29. The compat-ioctl cleanup series moved the handling for this around, which broke building without CONFIG_BLOCK.

Just remove the code handling it for compat mode.
---

Quoted 9 lines · Alexander Beregalov

2009/12/21 Al Viro <[email protected]>:

Quoted 6 lines · Alexander Beregalov
Quoted 2 lines

Fix this build error when CONFIG_BLOCK is not set. fs/compat_ioctl.c:1604: error: 'SG_SET_TRANSFORM' undeclared

Do you want that through VFS tree? I'm going to send a bunch of assorted fixes tomorrow morning, so I can pass that one at the same time...

Yes, please.

Sorry for being slow on this, I already had the fix prepared when Randy found it last week but had not gotten around to submitting it.

Al, the patch that Alexander has sent is obviously correct as well, so if you have already prepared the series just keep that one, otherwise please replace it with this one.

fs/compat_ioctl.c +0 -2
@@ -1600,8 +1600,6 @@ static long do_ioctl_trans(int fd, unsigned int cmd,
 	case KDSKBMETA:
 	case KDSKBLED:
 	case KDSETLED:
-	/* SG stuff */
-	case SG_SET_TRANSFORM:
 	/* AUTOFS */
 	case AUTOFS_IOC_READY:
 	case AUTOFS_IOC_FAIL: