staging: remove ncpfs and ipx code
Subsystems (5)
Greg Kroah-Hartman
maintainercover staging: remove ncpfs and ipx code
The ncpfs filesystem and ipx networking code moved into the drivers/staging/ tree back in November of last year. Since then, no one has steped up to take over maintance of this code. Given that it has been more than 6 months, it is time to delete it.
Note, there is more work to be done to remove the ipx header files completly, as it is burried deep into the networking stack in places. I will work on a patch series to complete that later, after this is merged, in order to clean up the last remaining bits properly.
Unless there are any objections, I'll take this through my staging tree.
Greg Kroah-Hartman (5):
staging: ncpfs: delete it
ncpfs: remove compat functionality
ncpfs: remove Documentation
ncpfs: remove uapi .h files
staging: ipx: delete it from the tree
Documentation/filesystems/00-INDEX | 2 - Documentation/filesystems/ncpfs.txt | 12 - drivers/staging/Kconfig | 4 - drivers/staging/Makefile | 2 - drivers/staging/ipx/Kconfig | 61 - drivers/staging/ipx/Makefile | 8 - drivers/staging/ipx/TODO | 4 - drivers/staging/ipx/af_ipx.c | 2082 ------------------------ drivers/staging/ipx/ipx_proc.c | 338 ---- drivers/staging/ipx/ipx_route.c | 293 ---- drivers/staging/ipx/pe2.c | 36 - drivers/staging/ipx/sysctl_net_ipx.c | 40 - drivers/staging/ncpfs/Kconfig | 108 -- drivers/staging/ncpfs/Makefile | 17 - drivers/staging/ncpfs/TODO | 4 - drivers/staging/ncpfs/dir.c | 1232 -------------- drivers/staging/ncpfs/file.c | 263 --- drivers/staging/ncpfs/getopt.c | 76 - drivers/staging/ncpfs/getopt.h | 17 - drivers/staging/ncpfs/inode.c | 1067 ------------ drivers/staging/ncpfs/ioctl.c | 923 ----------- drivers/staging/ncpfs/mmap.c | 125 -- drivers/staging/ncpfs/ncp_fs.h | 101 -- drivers/staging/ncpfs/ncp_fs_i.h | 31 - drivers/staging/ncpfs/ncp_fs_sb.h | 174 -- drivers/staging/ncpfs/ncplib_kernel.c | 1326 --------------- drivers/staging/ncpfs/ncplib_kernel.h | 215 --- drivers/staging/ncpfs/ncpsign_kernel.c | 128 -- drivers/staging/ncpfs/ncpsign_kernel.h | 27 - drivers/staging/ncpfs/sock.c | 855 ---------- drivers/staging/ncpfs/symlink.c | 182 --- fs/compat.c | 72 +- include/uapi/linux/ncp.h | 202 --- include/uapi/linux/ncp_fs.h | 147 -- include/uapi/linux/ncp_mount.h | 72 - include/uapi/linux/ncp_no.h | 20 - 36 files changed, 1 insertion(+), 10265 deletions(-) delete mode 100644 Documentation/filesystems/ncpfs.txt delete mode 100644 drivers/staging/ipx/Kconfig delete mode 100644 drivers/staging/ipx/Makefile delete mode 100644 drivers/staging/ipx/TODO delete mode 100644 drivers/staging/ipx/af_ipx.c delete mode 100644 drivers/staging/ipx/ipx_proc.c delete mode 100644 drivers/staging/ipx/ipx_route.c delete mode 100644 drivers/staging/ipx/pe2.c delete mode 100644 drivers/staging/ipx/sysctl_net_ipx.c delete mode 100644 drivers/staging/ncpfs/Kconfig delete mode 100644 drivers/staging/ncpfs/Makefile delete mode 100644 drivers/staging/ncpfs/TODO delete mode 100644 drivers/staging/ncpfs/dir.c delete mode 100644 drivers/staging/ncpfs/file.c delete mode 100644 drivers/staging/ncpfs/getopt.c delete mode 100644 drivers/staging/ncpfs/getopt.h delete mode 100644 drivers/staging/ncpfs/inode.c delete mode 100644 drivers/staging/ncpfs/ioctl.c delete mode 100644 drivers/staging/ncpfs/mmap.c delete mode 100644 drivers/staging/ncpfs/ncp_fs.h delete mode 100644 drivers/staging/ncpfs/ncp_fs_i.h delete mode 100644 drivers/staging/ncpfs/ncp_fs_sb.h delete mode 100644 drivers/staging/ncpfs/ncplib_kernel.c delete mode 100644 drivers/staging/ncpfs/ncplib_kernel.h delete mode 100644 drivers/staging/ncpfs/ncpsign_kernel.c delete mode 100644 drivers/staging/ncpfs/ncpsign_kernel.h delete mode 100644 drivers/staging/ncpfs/sock.c delete mode 100644 drivers/staging/ncpfs/symlink.c delete mode 100644 include/uapi/linux/ncp.h delete mode 100644 include/uapi/linux/ncp_fs.h delete mode 100644 include/uapi/linux/ncp_mount.h delete mode 100644 include/uapi/linux/ncp_no.h
Signature · 1 line
2.17.1
Greg Kroah-Hartman
maintainerPATCH 1/5 staging: ncpfs: delete it
The ncpfs code moved into the staging tree back in November 2017 and no one has complained or even noticed it was gone. Because of that, let's just delete it.
Cc Stephen Hemminger <[email protected]>
Cc David S. Miller <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
--- drivers/staging/Kconfig | 2 - drivers/staging/Makefile | 1 - drivers/staging/ncpfs/Kconfig | 108 -- drivers/staging/ncpfs/Makefile | 17 - drivers/staging/ncpfs/TODO | 4 - drivers/staging/ncpfs/dir.c | 1232 ---------------------- drivers/staging/ncpfs/file.c | 263 ----- drivers/staging/ncpfs/getopt.c | 76 -- drivers/staging/ncpfs/getopt.h | 17 - drivers/staging/ncpfs/inode.c | 1067 ------------------- drivers/staging/ncpfs/ioctl.c | 923 ----------------- drivers/staging/ncpfs/mmap.c | 125 --- drivers/staging/ncpfs/ncp_fs.h | 101 -- drivers/staging/ncpfs/ncp_fs_i.h | 31 - drivers/staging/ncpfs/ncp_fs_sb.h | 174 ---- drivers/staging/ncpfs/ncplib_kernel.c | 1326 ------------------------ drivers/staging/ncpfs/ncplib_kernel.h | 215 ---- drivers/staging/ncpfs/ncpsign_kernel.c | 128 --- drivers/staging/ncpfs/ncpsign_kernel.h | 27 - drivers/staging/ncpfs/sock.c | 855 --------------- drivers/staging/ncpfs/symlink.c | 182 ---- 21 files changed, 6874 deletions(-) delete mode 100644 drivers/staging/ncpfs/Kconfig delete mode 100644 drivers/staging/ncpfs/Makefile delete mode 100644 drivers/staging/ncpfs/TODO delete mode 100644 drivers/staging/ncpfs/dir.c delete mode 100644 drivers/staging/ncpfs/file.c delete mode 100644 drivers/staging/ncpfs/getopt.c delete mode 100644 drivers/staging/ncpfs/getopt.h delete mode 100644 drivers/staging/ncpfs/inode.c delete mode 100644 drivers/staging/ncpfs/ioctl.c delete mode 100644 drivers/staging/ncpfs/mmap.c delete mode 100644 drivers/staging/ncpfs/ncp_fs.h delete mode 100644 drivers/staging/ncpfs/ncp_fs_i.h delete mode 100644 drivers/staging/ncpfs/ncp_fs_sb.h delete mode 100644 drivers/staging/ncpfs/ncplib_kernel.c delete mode 100644 drivers/staging/ncpfs/ncplib_kernel.h delete mode 100644 drivers/staging/ncpfs/ncpsign_kernel.c delete mode 100644 drivers/staging/ncpfs/ncpsign_kernel.h delete mode 100644 drivers/staging/ncpfs/sock.c delete mode 100644 drivers/staging/ncpfs/symlink.c
drivers/staging/Kconfig +0 -2
@@ -26,8 +26,6 @@ if STAGING source "drivers/staging/ipx/Kconfig" -source "drivers/staging/ncpfs/Kconfig" - source "drivers/staging/wlan-ng/Kconfig" source "drivers/staging/comedi/Kconfig"
drivers/staging/Makefile +0 -1
@@ -4,7 +4,6 @@ obj-y += media/ obj-y += typec/ obj-$(CONFIG_IPX) += ipx/ -obj-$(CONFIG_NCP_FS) += ncpfs/ obj-$(CONFIG_PRISM2_USB) += wlan-ng/ obj-$(CONFIG_COMEDI) += comedi/ obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/
drivers/staging/ncpfs/Kconfig deleted +0 -0
drivers/staging/ncpfs/Makefile deleted +0 -0
drivers/staging/ncpfs/TODO deleted +0 -0
drivers/staging/ncpfs/dir.c deleted +0 -0
drivers/staging/ncpfs/file.c deleted +0 -0
drivers/staging/ncpfs/getopt.c deleted +0 -0
drivers/staging/ncpfs/getopt.h deleted +0 -0
drivers/staging/ncpfs/inode.c deleted +0 -0
drivers/staging/ncpfs/ioctl.c deleted +0 -0
drivers/staging/ncpfs/mmap.c deleted +0 -0
drivers/staging/ncpfs/ncp_fs.h deleted +0 -0
drivers/staging/ncpfs/ncp_fs_i.h deleted +0 -0
drivers/staging/ncpfs/ncp_fs_sb.h deleted +0 -0
drivers/staging/ncpfs/ncplib_kernel.c deleted +0 -0
drivers/staging/ncpfs/ncplib_kernel.h deleted +0 -0
drivers/staging/ncpfs/ncpsign_kernel.c deleted +0 -0
drivers/staging/ncpfs/ncpsign_kernel.h deleted +0 -0
drivers/staging/ncpfs/sock.c deleted +0 -0
drivers/staging/ncpfs/symlink.c deleted +0 -0
Signature · 1 line
2.17.1
Greg Kroah-Hartman
maintainerPATCH 2/5 ncpfs: remove compat functionality
In reply to Greg Kroah-HartmanNow that ncpfs is gone from the tree, no need to have the compatibility thunking layer around, it will not actually go anywhere :)
So delete that logic from fs/compat.c, it is no longer needed.
Signed-off-by Greg Kroah-Hartman <[email protected]>
--- fs/compat.c | 72 +---------------------------------------------------- 1 file changed, 1 insertion(+), 71 deletions(-)
fs/compat.c +1 -71
@@ -16,79 +16,12 @@*/ #include <linux/compat.h> -#include <linux/ncp_mount.h> #include <linux/nfs4_mount.h> #include <linux/syscalls.h> #include <linux/slab.h> #include <linux/uaccess.h> #include "internal.h" -struct compat_ncp_mount_data { -compat_int_t version; -compat_uint_t ncp_fd; -__compat_uid_t mounted_uid; -compat_pid_t wdog_pid; -unsigned char mounted_vol[NCP_VOLNAME_LEN +1 ]; -compat_uint_t time_out; -compat_uint_t retry_count; -compat_uint_t flags; -__compat_uid_t uid; -__compat_gid_t gid; -compat_mode_t file_mode; -compat_mode_t dir_mode; -}; - -struct compat_ncp_mount_data_v4 { -compat_int_t version; -compat_ulong_t flags; -compat_ulong_t mounted_uid; -compat_long_t wdog_pid; -compat_uint_t ncp_fd; -compat_uint_t time_out; -compat_uint_t retry_count; -compat_ulong_t uid; -compat_ulong_t gid; -compat_ulong_t file_mode; -compat_ulong_t dir_mode; -}; - -static void *do_ncp_super_data_conv (void *raw_data) -{ -int version = *(unsigned int *)raw_data; - -if (version ==3 ) { -struct compat_ncp_mount_data *c_n = raw_data; -struct ncp_mount_data *n = raw_data; - - n->dir_mode = c_n->dir_mode; - n->file_mode = c_n->file_mode; - n->gid = c_n->gid; - n->uid = c_n->uid; -memmove (n->mounted_vol, c_n->mounted_vol, (sizeof (c_n->mounted_vol) +3 *sizeof (unsigned int ))); - n->wdog_pid = c_n->wdog_pid; - n->mounted_uid = c_n->mounted_uid; - }else if (version ==4 ) { -struct compat_ncp_mount_data_v4 *c_n = raw_data; -struct ncp_mount_data_v4 *n = raw_data; - - n->dir_mode = c_n->dir_mode; - n->file_mode = c_n->file_mode; - n->gid = c_n->gid; - n->uid = c_n->uid; - n->retry_count = c_n->retry_count; - n->time_out = c_n->time_out; - n->ncp_fd = c_n->ncp_fd; - n->wdog_pid = c_n->wdog_pid; - n->mounted_uid = c_n->mounted_uid; - n->flags = c_n->flags; - }else if (version !=5 ) { -return NULL ; - } - -return raw_data; -} - -struct compat_nfs_string {compat_uint_t len;compat_uptr_t data;
@@ -154,7 +87,6 @@ static int do_nfs4_super_data_conv(void *raw_data)return 0 ; } -#define NCPFS_NAME "ncpfs"#define NFS4_NAME "nfs4" COMPAT_SYSCALL_DEFINE5(mount, const char __user *, dev_name,
@@ -183,9 +115,7 @@ COMPAT_SYSCALL_DEFINE5(mount, const char __user *, dev_name, goto out2;if (kernel_type && options) { -if (!strcmp (kernel_type,NCPFS_NAME )) { -do_ncp_super_data_conv (options); - }else if (!strcmp (kernel_type,NFS4_NAME )) { +if (!strcmp (kernel_type,NFS4_NAME )) { retval = -EINVAL ;if (do_nfs4_super_data_conv (options)) goto out3;
Signature · 1 line
2.17.1
Greg Kroah-Hartman
maintainerPATCH 3/5 ncpfs: remove Documentation
In reply to Greg Kroah-HartmanNo need for any more ncpfs documentation around given that the filesystem is now removed.
Signed-off-by Greg Kroah-Hartman <[email protected]>
--- Documentation/filesystems/00-INDEX | 2 -- Documentation/filesystems/ncpfs.txt | 12 ------------ 2 files changed, 14 deletions(-) delete mode 100644 Documentation/filesystems/ncpfs.txt
Documentation/filesystems/00-INDEX +0 -2
@@ -89,8 +89,6 @@ locks.txt - info on file locking implementations, flock() vs. fcntl(), etc. mandatory-locking.txt - info on the Linux implementation of Sys V mandatory file locking. -ncpfs.txt - - info on Novell Netware(tm) filesystem using NCP protocol. nfs/ - nfs-related documentation. nilfs2.txt
Documentation/filesystems/ncpfs.txt deleted +0 -0
Signature · 1 line
2.17.1
Greg Kroah-Hartman
maintainerPATCH 4/5 ncpfs: remove uapi .h files
In reply to Greg Kroah-HartmanNow that ncpfs is removed from the tree, there is no need to keep the uapi header files around as no one uses them, and it is not a feature that the kernel supports anymore.
Signed-off-by Greg Kroah-Hartman <[email protected]>
--- include/uapi/linux/ncp.h | 202 --------------------------------- include/uapi/linux/ncp_fs.h | 147 ------------------------ include/uapi/linux/ncp_mount.h | 72 ------------ include/uapi/linux/ncp_no.h | 20 ---- 4 files changed, 441 deletions(-) delete mode 100644 include/uapi/linux/ncp.h delete mode 100644 include/uapi/linux/ncp_fs.h delete mode 100644 include/uapi/linux/ncp_mount.h delete mode 100644 include/uapi/linux/ncp_no.h
include/uapi/linux/ncp.h deleted +0 -0
include/uapi/linux/ncp_fs.h deleted +0 -0
include/uapi/linux/ncp_mount.h deleted +0 -0
include/uapi/linux/ncp_no.h deleted +0 -0
Signature · 1 line
2.17.1
Greg Kroah-Hartman
maintainerPATCH 5/5 staging: ipx: delete it from the tree
In reply to Greg Kroah-HartmanThe ipx code moved into the staging tree back in November 2017 and no one has complained or even noticed it was gone. Because of that, let's just delete it.
Note, the ipx header files are not removed here, that will come later through the networking tree, as that takes a bit more work to unwind.
Cc Stephen Hemminger <[email protected]>
Cc David S. Miller <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
--- drivers/staging/Kconfig | 2 - drivers/staging/Makefile | 1 - drivers/staging/ipx/Kconfig | 61 - drivers/staging/ipx/Makefile | 8 - drivers/staging/ipx/TODO | 4 - drivers/staging/ipx/af_ipx.c | 2082 -------------------------- drivers/staging/ipx/ipx_proc.c | 338 ----- drivers/staging/ipx/ipx_route.c | 293 ---- drivers/staging/ipx/pe2.c | 36 - drivers/staging/ipx/sysctl_net_ipx.c | 40 - 10 files changed, 2865 deletions(-) delete mode 100644 drivers/staging/ipx/Kconfig delete mode 100644 drivers/staging/ipx/Makefile delete mode 100644 drivers/staging/ipx/TODO delete mode 100644 drivers/staging/ipx/af_ipx.c delete mode 100644 drivers/staging/ipx/ipx_proc.c delete mode 100644 drivers/staging/ipx/ipx_route.c delete mode 100644 drivers/staging/ipx/pe2.c delete mode 100644 drivers/staging/ipx/sysctl_net_ipx.c
drivers/staging/Kconfig +0 -2
@@ -24,8 +24,6 @@ menuconfig STAGING if STAGING -source "drivers/staging/ipx/Kconfig" - source "drivers/staging/wlan-ng/Kconfig" source "drivers/staging/comedi/Kconfig"
drivers/staging/Makefile +0 -1
@@ -3,7 +3,6 @@ obj-y += media/ obj-y += typec/ -obj-$(CONFIG_IPX) += ipx/ obj-$(CONFIG_PRISM2_USB) += wlan-ng/ obj-$(CONFIG_COMEDI) += comedi/ obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/
drivers/staging/ipx/Kconfig deleted +0 -0
drivers/staging/ipx/Makefile deleted +0 -0
drivers/staging/ipx/TODO deleted +0 -0
drivers/staging/ipx/af_ipx.c deleted +0 -0
drivers/staging/ipx/ipx_proc.c deleted +0 -0
drivers/staging/ipx/ipx_route.c deleted +0 -0
drivers/staging/ipx/pe2.c deleted +0 -0
drivers/staging/ipx/sysctl_net_ipx.c deleted +0 -0
Signature · 1 line
2.17.1