Remove a few UMSDOS leftovers

PATCH NAK Jesper Juhl 2 participants 5 messages May 24, 2007

Subsystems (2)

Documentation User-mode Linux (UML)

lore

Share & tools

lore

Jesper Juhl

author

2007-05-24 22:57 UTC #0 lore raw

PATCH 1/1 Remove a few UMSDOS leftovers

The UMSDOS filesystem was removed back in 2.6.11, but some tiny bits stuck around. This patch removes the few leftovers.
The only things left behind after this are the entries in the CREDITS file.

Signed-off-by Jesper Juhl <[email protected]>

---

 Documentation/ioctl-number.txt |    1 -
 arch/arm26/defconfig           |    1 -
 arch/cris/arch-v10/defconfig   |    1 -
 arch/um/config.release         |    1 -
 include/linux/ncp_fs.h         |    2 --
 5 files changed, 0 insertions(+), 6 deletions(-)

Documentation/ioctl-number.txt +0 -1

index 3de7d37..f9f15bf 100644
@@ -67,7 +67,6 @@ Code	Seq#	Include File		Comments
 0x00	00-1F	linux/wavefront.h	conflict!
 0x02	all	linux/fd.h
 0x03	all	linux/hdreg.h
-0x04	all	linux/umsdos_fs.h
 0x06	all	linux/lp.h
 0x09	all	linux/md.h
 0x12	all	linux/fs.h

arch/arm26/defconfig +0 -1

index c4a8970..2b7d44b 100644
@@ -248,7 +248,6 @@ CONFIG_I2C_CHARDEV=y
 # CONFIG_JBD_DEBUG is not set
 # CONFIG_FAT_FS is not set
 # CONFIG_MSDOS_FS is not set
-# CONFIG_UMSDOS_FS is not set
 # CONFIG_VFAT_FS is not set
 # CONFIG_EFS_FS is not set
 # CONFIG_JFFS_FS is not set

arch/cris/arch-v10/defconfig +0 -1

index 2a3411e..710c20b 100644
@@ -429,7 +429,6 @@ CONFIG_NET_ETHERNET=y
 # CONFIG_BFS_FS is not set
 # CONFIG_FAT_FS is not set
 # CONFIG_MSDOS_FS is not set
-# CONFIG_UMSDOS_FS is not set
 # CONFIG_VFAT_FS is not set
 # CONFIG_EFS_FS is not set
 # CONFIG_JFFS_FS is not set

arch/um/config.release +0 -1

index fc68bcb..aba42f8 100644
@@ -200,7 +200,6 @@ CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
 CONFIG_FAT_FS=y
 CONFIG_MSDOS_FS=y
-CONFIG_UMSDOS_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_EFS_FS=m
 # CONFIG_JFFS_FS is not set

include/linux/ncp_fs.h +0 -2

index 83e39eb..88766e4 100644
@@ -148,8 +148,6 @@ struct ncp_nls_ioctl
 #include <linux/ncp_fs_i.h>
 #include <linux/ncp_fs_sb.h>
 
-/* undef because public define in umsdos_fs.h (ncp_fs.h isn't public) */
-#undef PRINTK
 /* define because it is easy to change PRINTK to {*}PRINTK */
 #define PRINTK(format, args...) printk(KERN_DEBUG format , ## args)

H. Peter Anvin

NAK

2007-05-24 23:11 UTC #1 lore raw

Quoted 19 lines · Jesper Juhl

The UMSDOS filesystem was removed back in 2.6.11, but some tiny bits stuck around. This patch removes the few leftovers.
The only things left behind after this are the entries in the CREDITS file.
Signed-off-by Jesper Juhl <[email protected]>
---
 Documentation/ioctl-number.txt |    1 -
 arch/arm26/defconfig           |    1 -
 arch/cris/arch-v10/defconfig   |    1 -
 arch/um/config.release         |    1 -
 include/linux/ncp_fs.h         |    2 --
 5 files changed, 0 insertions(+), 6 deletions(-)
Documentation/ioctl-number.txt +0 -0
index 3de7d37..f9f15bf 100644

Documentation/ioctl-number.txt Code Seq# Include File Comments · line 72

Quoted 7 lines

Documentation/ioctl-number.txt +0 -1

@@ -67,7 +67,6 @@ Code	Seq#	Include File		Comments
 0x00	00-1F	linux/wavefront.h	conflict!
 0x02	all	linux/fd.h
 0x03	all	linux/hdreg.h
-0x04	all	linux/umsdos_fs.h
 0x06	all	linux/lp.h
 0x09	all	linux/md.h
 0x12	all	linux/fs.h

NAK!

We should at least document which ioctl numbers have been burned, since they SHOULD NOT be reused.

-hpa

Jesper Juhl

author

2007-05-24 23:13 UTC #2 lore raw

Quoted 7 lines · On Friday 25 May 2007 01:07:17 H. Peter Anvin wrote:

Quoted 6 lines · Jesper Juhl
The UMSDOS filesystem was removed back in 2.6.11, but some tiny bits stuck around. This patch removes the few leftovers.
The only things left behind after this are the entries in the CREDITS file.
Signed-off-by Jesper Juhl <[email protected]>
---

[snip]

Quoted 13 lines

Documentation/ioctl-number.txt Code Seq# Include File Comments · line 72
Quoted 10 lines
Documentation/ioctl-number.txt +0 -1
@@ -67,7 +67,6 @@ Code	Seq#	Include File		Comments
 0x00	00-1F	linux/wavefront.h	conflict!
 0x02	all	linux/fd.h
 0x03	all	linux/hdreg.h
-0x04	all	linux/umsdos_fs.h
 0x06	all	linux/lp.h
 0x09	all	linux/md.h
 0x12	all	linux/fs.h
NAK!

Quoted 3 lines

We should at least document which ioctl numbers have been burned, since they SHOULD NOT be reused.

Ok, that makes sense. How about this version :

The UMSDOS filesystem was removed back in 2.6.11, but some tiny bits stuck around. This patch removes the few leftovers.
The only things left behind after this are the entries in the CREDITS file and the ioctl number in Documentation/ioctl-number.txt as documentation.

Signed-off-by Jesper Juhl <[email protected]>

---

 Documentation/ioctl-number.txt |    2 +-
 arch/arm26/defconfig           |    1 -
 arch/cris/arch-v10/defconfig   |    1 -
 arch/um/config.release         |    1 -
 include/linux/ncp_fs.h         |    2 --
 5 files changed, 1 insertions(+), 6 deletions(-)

Documentation/ioctl-number.txt +1 -1

index 3de7d37..4413866 100644
@@ -67,7 +67,7 @@ Code	Seq#	Include File		Comments
 0x00	00-1F	linux/wavefront.h	conflict!
 0x02	all	linux/fd.h
 0x03	all	linux/hdreg.h
-0x04	all	linux/umsdos_fs.h
+0x04	all	linux/umsdos_fs.h	Dead, but don't reuse this ioctl number.
 0x06	all	linux/lp.h
 0x09	all	linux/md.h
 0x12	all	linux/fs.h

arch/arm26/defconfig +0 -1

index c4a8970..2b7d44b 100644
@@ -248,7 +248,6 @@ CONFIG_I2C_CHARDEV=y
 # CONFIG_JBD_DEBUG is not set
 # CONFIG_FAT_FS is not set
 # CONFIG_MSDOS_FS is not set
-# CONFIG_UMSDOS_FS is not set
 # CONFIG_VFAT_FS is not set
 # CONFIG_EFS_FS is not set
 # CONFIG_JFFS_FS is not set

arch/cris/arch-v10/defconfig +0 -1

index 2a3411e..710c20b 100644
@@ -429,7 +429,6 @@ CONFIG_NET_ETHERNET=y
 # CONFIG_BFS_FS is not set
 # CONFIG_FAT_FS is not set
 # CONFIG_MSDOS_FS is not set
-# CONFIG_UMSDOS_FS is not set
 # CONFIG_VFAT_FS is not set
 # CONFIG_EFS_FS is not set
 # CONFIG_JFFS_FS is not set

arch/um/config.release +0 -1

index fc68bcb..aba42f8 100644
@@ -200,7 +200,6 @@ CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
 CONFIG_FAT_FS=y
 CONFIG_MSDOS_FS=y
-CONFIG_UMSDOS_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_EFS_FS=m
 # CONFIG_JFFS_FS is not set

include/linux/ncp_fs.h +0 -2

index 83e39eb..88766e4 100644
@@ -148,8 +148,6 @@ struct ncp_nls_ioctl
 #include <linux/ncp_fs_i.h>
 #include <linux/ncp_fs_sb.h>
 
-/* undef because public define in umsdos_fs.h (ncp_fs.h isn't public) */
-#undef PRINTK
 /* define because it is easy to change PRINTK to {*}PRINTK */
 #define PRINTK(format, args...) printk(KERN_DEBUG format , ## args)

H. Peter Anvin

2007-05-24 23:27 UTC #3 lore raw

Quoted 1 line · Jesper Juhl

Ok, that makes sense. How about this version :

Could you document which numbers were actually used by umsdos, instead of reserving a full block of 256? Since it's dead, it's not going to eat any more numbers.

-hpa

Jesper Juhl

author

2007-05-24 23:27 UTC #4 lore raw

Quoted 7 lines · H. Peter Anvin

Quoted 1 line · Jesper Juhl
Ok, that makes sense. How about this version :
Could you document which numbers were actually used by umsdos, instead of reserving a full block of 256? Since it's dead, it's not going to eat any more numbers.

Sure, I'll dig out that information and prepare a new patch tomorrow (need to catch some sleep right now).

Signature · 3 lines

Jesper Juhl <[email protected]>
Don't top-post  http://www.catb.org/~esr/jargon/html/T/top-post.html
Plain text mails only, please      http://www.expita.com/nomime.html