smbfs: move to drivers/staging
Subsystems (5)
PATCH 1/1 smbfs: move to drivers/staging
smbfs has been scheduled for removal in 2.6.27, so maybe we can now move it to drivers/staging on the way out.
smbfs still uses the big kernel lock and nobody
is going to fix that, so we should be getting
rid of it soon.
This removes the 32 bit compat mount and ioctl
handling code, which is implemented in common fs
code, and moves all smbfs related files intodrivers/staging/smbfs.
---
Documentation/filesystems/00-INDEX | 2 -
Documentation/ioctl/ioctl-number.txt | 2 +-
drivers/staging/Kconfig | 2 +
drivers/staging/Makefile | 1 +
{fs => drivers/staging}/smbfs/Kconfig | 0
{fs => drivers/staging}/smbfs/Makefile | 0
drivers/staging/smbfs/TODO | 8 +++++
{fs => drivers/staging}/smbfs/cache.c | 2 +-
{fs => drivers/staging}/smbfs/dir.c | 6 ++--
{fs => drivers/staging}/smbfs/file.c | 5 +--
{fs => drivers/staging}/smbfs/getopt.c | 0
{fs => drivers/staging}/smbfs/getopt.h | 0
{fs => drivers/staging}/smbfs/inode.c | 8 ++--
{fs => drivers/staging}/smbfs/ioctl.c | 5 +--
{fs => drivers/staging}/smbfs/proc.c | 7 ++--
{fs => drivers/staging}/smbfs/proto.h | 0
{fs => drivers/staging}/smbfs/request.c | 7 ++--
{fs => drivers/staging}/smbfs/request.h | 0
{include/linux => drivers/staging/smbfs}/smb.h | 0
{fs => drivers/staging}/smbfs/smb_debug.h | 0
{include/linux => drivers/staging/smbfs}/smb_fs.h | 8 ++--
.../linux => drivers/staging/smbfs}/smb_fs_i.h | 0
.../linux => drivers/staging/smbfs}/smb_fs_sb.h | 2 +-
.../linux => drivers/staging/smbfs}/smb_mount.h | 0
.../staging/smbfs}/smbfs.txt | 0
{fs => drivers/staging}/smbfs/smbiod.c | 7 ++--
{include/linux => drivers/staging/smbfs}/smbno.h | 0
{fs => drivers/staging}/smbfs/sock.c | 7 ++--
{fs => drivers/staging}/smbfs/symlink.c | 5 +--
fs/Kconfig | 1 -
fs/Makefile | 1 -
fs/compat.c | 31 +-------------------
fs/compat_ioctl.c | 26 ----------------
include/linux/Kbuild | 4 --
34 files changed, 44 insertions(+), 103 deletions(-)
rename {fs => drivers/staging}/smbfs/Kconfig (100%)
rename {fs => drivers/staging}/smbfs/Makefile (100%)
create mode 100644 drivers/staging/smbfs/TODO
rename {fs => drivers/staging}/smbfs/cache.c (99%)
rename {fs => drivers/staging}/smbfs/dir.c (99%)
rename {fs => drivers/staging}/smbfs/file.c (99%)
rename {fs => drivers/staging}/smbfs/getopt.c (100%)
rename {fs => drivers/staging}/smbfs/getopt.h (100%)
rename {fs => drivers/staging}/smbfs/inode.c (99%)
rename {fs => drivers/staging}/smbfs/ioctl.c (96%)
rename {fs => drivers/staging}/smbfs/proc.c (99%)
rename {fs => drivers/staging}/smbfs/proto.h (100%)
rename {fs => drivers/staging}/smbfs/request.c (99%)
rename {fs => drivers/staging}/smbfs/request.h (100%)
rename {include/linux => drivers/staging/smbfs}/smb.h (100%)
rename {fs => drivers/staging}/smbfs/smb_debug.h (100%)
rename {include/linux => drivers/staging/smbfs}/smb_fs.h (97%)
rename {include/linux => drivers/staging/smbfs}/smb_fs_i.h (100%)
rename {include/linux => drivers/staging/smbfs}/smb_fs_sb.h (98%)
rename {include/linux => drivers/staging/smbfs}/smb_mount.h (100%)
rename {Documentation/filesystems => drivers/staging/smbfs}/smbfs.txt (100%)
rename {fs => drivers/staging}/smbfs/smbiod.c (98%)
rename {include/linux => drivers/staging/smbfs}/smbno.h (100%)
rename {fs => drivers/staging}/smbfs/sock.c (99%)
rename {fs => drivers/staging}/smbfs/symlink.c (96%)Documentation/filesystems/00-INDEX +0 -2
@@ -96,8 +96,6 @@ seq_file.txt - how to use the seq_file API sharedsubtree.txt - a description of shared subtrees for namespaces. -smbfs.txt - - info on using filesystems with the SMB protocol (Win 3.11 and NT). spufs.txt - info and mount options for the SPU filesystem used on Cell. sysfs-pci.txt
Documentation/ioctl/ioctl-number.txt +1 -1
@@ -259,7 +259,7 @@ Code Seq#(hex) Include File Comments 't' 00-7F linux/if_ppp.h 't' 80-8F linux/isdn_ppp.h 't' 90 linux/toshiba.h -'u' 00-1F linux/smb_fs.h +'u' 00-1F linux/smb_fs.h gone 'v' all linux/videodev.h conflict! 'v' 00-1F linux/ext2_fs.h conflict! 'v' 00-1F linux/fs.h conflict!
drivers/staging/Kconfig +2 -0
@@ -149,6 +149,8 @@ source "drivers/staging/msm/Kconfig" source "drivers/staging/lirc/Kconfig" +source "drivers/staging/smbfs/Kconfig" + source "drivers/staging/easycap/Kconfig" source "drivers/staging/solo6x10/Kconfig"
drivers/staging/Makefile +1 -0
@@ -32,6 +32,7 @@ obj-$(CONFIG_AUTOFS_FS) += autofs/ obj-$(CONFIG_IDE_PHISON) += phison/ obj-$(CONFIG_LINE6_USB) += line6/ obj-$(CONFIG_USB_SERIAL_QUATECH2) += serqt_usb2/ +obj-$(CONFIG_SMB_FS) += smbfs/ obj-$(CONFIG_USB_SERIAL_QUATECH_USB2) += quatech_usb2/ obj-$(CONFIG_OCTEON_ETHERNET) += octeon/ obj-$(CONFIG_VT6655) += vt6655/
drivers/staging/smbfs/Kconfig renamed from fs/smbfs/Kconfig +0 -0
drivers/staging/smbfs/Makefile renamed from fs/smbfs/Makefile +0 -0
drivers/staging/smbfs/TODO new file +8 -0
@@ -0,0 +1,8 @@ +smbfs is on its way out of the kernel, it has been replaced +by cifs several years ago. + +The smbfs code uses the big kernel lock which +is getting deprecated. + +Users that find smbfs to work but not cifs should contact +the CIFS developers on linux-cifs-u79uwXL29TaiAVqoAR/[email protected]
drivers/staging/smbfs/cache.c renamed from fs/smbfs/cache.c +1 -1
@@ -13,12 +13,12 @@#include <linux/errno.h> #include <linux/kernel.h> #include <linux/mm.h> -#include <linux/smb_fs.h> #include <linux/pagemap.h> #include <linux/net.h> #include <asm/page.h> +#include "smb_fs.h" #include "smb_debug.h" #include "proto.h"
drivers/staging/smbfs/dir.c renamed from fs/smbfs/dir.c +3 -3
@@ -15,9 +15,9 @@#include <linux/net.h> #include <linux/sched.h> -#include <linux/smb_fs.h> -#include <linux/smb_mount.h> -#include <linux/smbno.h> +#include "smb_fs.h" +#include "smb_mount.h" +#include "smbno.h" #include "smb_debug.h" #include "proto.h"
drivers/staging/smbfs/file.c renamed from fs/smbfs/file.c +2 -3
@@ -21,9 +21,8 @@#include <asm/uaccess.h> #include <asm/system.h> -#include <linux/smbno.h> -#include <linux/smb_fs.h> - +#include "smbno.h" +#include "smb_fs.h" #include "smb_debug.h" #include "proto.h"
drivers/staging/smbfs/getopt.c renamed from fs/smbfs/getopt.c +0 -0
drivers/staging/smbfs/getopt.h renamed from fs/smbfs/getopt.h +0 -0
drivers/staging/smbfs/inode.c renamed from fs/smbfs/inode.c +4 -4
@@ -26,13 +26,13 @@#include <linux/vfs.h> #include <linux/highuid.h> #include <linux/sched.h> -#include <linux/smb_fs.h> -#include <linux/smbno.h> -#include <linux/smb_mount.h> #include <asm/system.h> #include <asm/uaccess.h> +#include "smb_fs.h" +#include "smbno.h" +#include "smb_mount.h" #include "smb_debug.h" #include "getopt.h" #include "proto.h"
@@ -504,7 +504,7 @@ static int smb_fill_super(struct super_block *sb, void *raw_data, int silent)if (warn_count <5 ) { warn_count++;printk (KERN_EMERG "smbfs is deprecated and will be removed" -" from the 2.6.27 kernel. Please migrate to cifs\n" ); +" from the 2.6.37 kernel. Please migrate to cifs\n" ); }if (!raw_data)
drivers/staging/smbfs/ioctl.c renamed from fs/smbfs/ioctl.c +2 -3
@@ -16,11 +16,10 @@#include <linux/smp_lock.h> #include <linux/net.h> -#include <linux/smb_fs.h> -#include <linux/smb_mount.h> -#include <asm/uaccess.h> +#include "smb_fs.h" +#include "smb_mount.h" #include "proto.h" long
drivers/staging/smbfs/proc.c renamed from fs/smbfs/proc.c +3 -4
@@ -20,15 +20,14 @@#include <linux/smp_lock.h> #include <linux/net.h> #include <linux/vfs.h> -#include <linux/smb_fs.h> -#include <linux/smbno.h> -#include <linux/smb_mount.h> -#include <net/sock.h> #include <asm/string.h> #include <asm/div64.h> +#include "smb_fs.h" +#include "smbno.h" +#include "smb_mount.h" #include "smb_debug.h" #include "proto.h" #include "request.h"
drivers/staging/smbfs/proto.h renamed from fs/smbfs/proto.h +0 -0
drivers/staging/smbfs/request.c renamed from fs/smbfs/request.c +3 -4
@@ -13,10 +13,9 @@#include <linux/net.h> #include <linux/sched.h> -#include <linux/smb_fs.h> -#include <linux/smbno.h> -#include <linux/smb_mount.h> - +#include "smb_fs.h" +#include "smbno.h" +#include "smb_mount.h" #include "smb_debug.h" #include "request.h" #include "proto.h"
drivers/staging/smbfs/request.h renamed from fs/smbfs/request.h +0 -0
drivers/staging/smbfs/smb.h renamed from include/linux/smb.h +0 -0
drivers/staging/smbfs/smb_debug.h renamed from fs/smbfs/smb_debug.h +0 -0
drivers/staging/smbfs/smb_fs.h renamed from include/linux/smb_fs.h +4 -4
@@ -9,7 +9,7 @@#ifndef _LINUX_SMB_FS_H#define _LINUX_SMB_FS_H -#include <linux/smb.h> +#include "smb.h" /* * ioctl commands
@@ -22,13 +22,13 @@#ifdef __KERNEL__ -#include <linux/smb_fs_i.h> -#include <linux/smb_fs_sb.h> +#include "smb_fs_i.h" +#include "smb_fs_sb.h" +#include "smb_mount.h" #include <linux/fs.h> #include <linux/pagemap.h> #include <linux/vmalloc.h> -#include <linux/smb_mount.h> #include <linux/jiffies.h> #include <asm/unaligned.h>
drivers/staging/smbfs/smb_fs_i.h renamed from include/linux/smb_fs_i.h +0 -0
drivers/staging/smbfs/smb_fs_sb.h renamed from include/linux/smb_fs_sb.h +1 -1
@@ -11,7 +11,7 @@#include <linux/types.h> #include <linux/backing-dev.h> -#include <linux/smb.h> +#include "smb.h" /* * Upper limit on the total number of active smb_request structs.
drivers/staging/smbfs/smb_mount.h renamed from include/linux/smb_mount.h +0 -0
drivers/staging/smbfs/smbfs.txt renamed from Documentation/filesystems/smbfs.txt +0 -0
drivers/staging/smbfs/smbiod.c renamed from fs/smbfs/smbiod.c +3 -4
@@ -20,13 +20,12 @@#include <linux/kthread.h> #include <net/ip.h> -#include <linux/smb_fs.h> -#include <linux/smbno.h> -#include <linux/smb_mount.h> -#include <asm/system.h> #include <asm/uaccess.h> +#include "smb_fs.h" +#include "smbno.h" +#include "smb_mount.h" #include "smb_debug.h" #include "request.h" #include "proto.h"
drivers/staging/smbfs/smbno.h renamed from include/linux/smbno.h +0 -0
drivers/staging/smbfs/sock.c renamed from fs/smbfs/sock.c +3 -4
@@ -22,13 +22,12 @@#include <net/tcp_states.h> #include <net/ip.h> -#include <linux/smb_fs.h> -#include <linux/smb.h> -#include <linux/smbno.h> -#include <asm/uaccess.h> #include <asm/ioctls.h> +#include "smb_fs.h" +#include "smb.h" +#include "smbno.h" #include "smb_debug.h" #include "proto.h" #include "request.h"
drivers/staging/smbfs/symlink.c renamed from fs/smbfs/symlink.c +2 -3
@@ -19,9 +19,8 @@#include <asm/uaccess.h> #include <asm/system.h> -#include <linux/smbno.h> -#include <linux/smb_fs.h> - +#include "smbno.h" +#include "smb_fs.h" #include "smb_debug.h" #include "proto.h"
fs/Kconfig +0 -1
@@ -233,7 +233,6 @@ config NFS_COMMON default y source "net/sunrpc/Kconfig" -source "fs/smbfs/Kconfig" source "fs/ceph/Kconfig" source "fs/cifs/Kconfig" source "fs/ncpfs/Kconfig"
fs/Makefile +0 -1
@@ -91,7 +91,6 @@ obj-$(CONFIG_NFSD) += nfsd/ obj-$(CONFIG_LOCKD) += lockd/ obj-$(CONFIG_NLS) += nls/ obj-$(CONFIG_SYSV_FS) += sysv/ -obj-$(CONFIG_SMB_FS) += smbfs/ obj-$(CONFIG_CIFS) += cifs/ obj-$(CONFIG_NCP_FS) += ncpfs/ obj-$(CONFIG_HPFS_FS) += hpfs/
fs/compat.c +1 -30
@@ -29,8 +29,6 @@#include <linux/vfs.h> #include <linux/ioctl.h> #include <linux/init.h> -#include <linux/smb.h> -#include <linux/smb_mount.h> #include <linux/ncp_mount.h> #include <linux/nfs4_mount.h> #include <linux/syscalls.h>
@@ -745,30 +743,6 @@ static void *do_ncp_super_data_conv(void *raw_data)return raw_data; } -struct compat_smb_mount_data { -compat_int_t version; -__compat_uid_t mounted_uid; -__compat_uid_t uid; -__compat_gid_t gid; -compat_mode_t file_mode; -compat_mode_t dir_mode; -}; - -static void *do_smb_super_data_conv (void *raw_data) -{ -struct smb_mount_data *s = raw_data; -struct compat_smb_mount_data *c_s = raw_data; - -if (c_s->version !=SMB_MOUNT_OLDVERSION ) - goto out; - s->dir_mode = c_s->dir_mode; - s->file_mode = c_s->file_mode; - s->gid = c_s->gid; - s->uid = c_s->uid; - s->mounted_uid = c_s->mounted_uid; - out: -return raw_data; -}struct compat_nfs_string {compat_uint_t len;
@@ -835,7 +809,6 @@ static int do_nfs4_super_data_conv(void *raw_data)return 0 ; } -#define SMBFS_NAME "smbfs"#define NCPFS_NAME "ncpfs"#define NFS4_NAME "nfs4"
@@ -870,9 +843,7 @@ asmlinkage long compat_sys_mount(const char __user * dev_name, retval = -EINVAL ;if (kernel_type && data_page) { -if (!strcmp (kernel_type,SMBFS_NAME )) { -do_smb_super_data_conv ((void *)data_page); - }else if (!strcmp (kernel_type,NCPFS_NAME )) { +if (!strcmp (kernel_type,NCPFS_NAME )) {do_ncp_super_data_conv ((void *)data_page); }else if (!strcmp (kernel_type,NFS4_NAME )) {if (do_nfs4_super_data_conv ((void *) data_page))
fs/compat_ioctl.c +0 -26
@@ -46,7 +46,6 @@#include <linux/videodev.h> #include <linux/netdevice.h> #include <linux/raw.h> -#include <linux/smb_fs.h> #include <linux/blkdev.h> #include <linux/elevator.h> #include <linux/rtc.h>
@@ -558,25 +557,6 @@ static int mt_ioctl_trans(unsigned int fd, unsigned int cmd, void __user *argp)#endif /* CONFIG_BLOCK */ -static int do_smb_getmountuid (unsigned int fd,unsigned int cmd, -compat_uid_t __user *argp) -{ -mm_segment_t old_fs =get_fs (); -__kernel_uid_t kuid; -int err; - - cmd =SMB_IOC_GETMOUNTUID ; - -set_fs (KERNEL_DS ); - err =sys_ioctl (fd, cmd, (unsigned long )&kuid); -set_fs (old_fs); - -if (err >=0 ) - err =put_user (kuid, argp); - -return err; -} -/* Bluetooth ioctls */ #define HCIUARTSETPROTO _IOW('U', 200, int)#define HCIUARTGETPROTO _IOR('U', 201, int)
@@ -1265,8 +1245,6 @@ COMPATIBLE_IOCTL(OSS_GETVERSION)/* Raw devices */ COMPATIBLE_IOCTL(RAW_SETBIND) COMPATIBLE_IOCTL(RAW_GETBIND) -/* SMB ioctls which do not need any translations */ -COMPATIBLE_IOCTL(SMB_IOC_NEWCONN) /* Watchdog */ COMPATIBLE_IOCTL(WDIOC_GETSUPPORT) COMPATIBLE_IOCTL(WDIOC_GETSTATUS)
@@ -1528,10 +1506,6 @@ static long do_ioctl_trans(int fd, unsigned int cmd,case RAW_GETBIND :return raw_ioctl (fd, cmd, argp);#endif -/* One SMB ioctl needs translations. */ -#define SMB_IOC_GETMOUNTUID_32 _IOR('u', 1, compat_uid_t) -case SMB_IOC_GETMOUNTUID_32 : -return do_smb_getmountuid (fd, cmd, argp);/* Serial */ case TIOCGSERIAL :case TIOCSSERIAL :
include/linux/Kbuild +0 -4
@@ -326,10 +326,6 @@ header-y += serio.h header-y += shm.h header-y += signal.h header-y += signalfd.h -header-y += smb.h -header-y += smb_fs.h -header-y += smb_mount.h -header-y += smbno.h header-y += snmp.h header-y += socket.h header-y += sockios.h
Signature · 1 line
1.7.1
Quoted 616 lines · On Mon, 4 Oct 2010 22:55:57 +0200 Arnd Bergmann <[email protected]> wrote:
smbfs has been scheduled for removal in 2.6.27, so maybe we can now move it to
drivers/stagingon the way out.smbfs still uses the big kernel lock and nobody
is going to fix that, so we should be getting
rid of it soon.This removes the 32 bit compat mount and ioctl
handling code, which is implemented in common fs
code, and moves all smbfs related files intodrivers/staging/smbfs.Signed-off-by Arnd Bergmann <[email protected]>--- Documentation/filesystems/00-INDEX | 2 - Documentation/ioctl/ioctl-number.txt | 2 +- drivers/staging/Kconfig | 2 + drivers/staging/Makefile | 1 + {fs => drivers/staging}/smbfs/Kconfig | 0 {fs => drivers/staging}/smbfs/Makefile | 0 drivers/staging/smbfs/TODO | 8 +++++ {fs => drivers/staging}/smbfs/cache.c | 2 +- {fs => drivers/staging}/smbfs/dir.c | 6 ++-- {fs => drivers/staging}/smbfs/file.c | 5 +-- {fs => drivers/staging}/smbfs/getopt.c | 0 {fs => drivers/staging}/smbfs/getopt.h | 0 {fs => drivers/staging}/smbfs/inode.c | 8 ++-- {fs => drivers/staging}/smbfs/ioctl.c | 5 +-- {fs => drivers/staging}/smbfs/proc.c | 7 ++-- {fs => drivers/staging}/smbfs/proto.h | 0 {fs => drivers/staging}/smbfs/request.c | 7 ++-- {fs => drivers/staging}/smbfs/request.h | 0 {include/linux => drivers/staging/smbfs}/smb.h | 0 {fs => drivers/staging}/smbfs/smb_debug.h | 0 {include/linux => drivers/staging/smbfs}/smb_fs.h | 8 ++-- .../linux => drivers/staging/smbfs}/smb_fs_i.h | 0 .../linux => drivers/staging/smbfs}/smb_fs_sb.h | 2 +- .../linux => drivers/staging/smbfs}/smb_mount.h | 0 .../staging/smbfs}/smbfs.txt | 0 {fs => drivers/staging}/smbfs/smbiod.c | 7 ++-- {include/linux => drivers/staging/smbfs}/smbno.h | 0 {fs => drivers/staging}/smbfs/sock.c | 7 ++-- {fs => drivers/staging}/smbfs/symlink.c | 5 +-- fs/Kconfig | 1 - fs/Makefile | 1 - fs/compat.c | 31 +------------------- fs/compat_ioctl.c | 26 ---------------- include/linux/Kbuild | 4 -- 34 files changed, 44 insertions(+), 103 deletions(-) rename {fs => drivers/staging}/smbfs/Kconfig (100%) rename {fs => drivers/staging}/smbfs/Makefile (100%) create mode 100644 drivers/staging/smbfs/TODO rename {fs => drivers/staging}/smbfs/cache.c (99%) rename {fs => drivers/staging}/smbfs/dir.c (99%) rename {fs => drivers/staging}/smbfs/file.c (99%) rename {fs => drivers/staging}/smbfs/getopt.c (100%) rename {fs => drivers/staging}/smbfs/getopt.h (100%) rename {fs => drivers/staging}/smbfs/inode.c (99%) rename {fs => drivers/staging}/smbfs/ioctl.c (96%) rename {fs => drivers/staging}/smbfs/proc.c (99%) rename {fs => drivers/staging}/smbfs/proto.h (100%) rename {fs => drivers/staging}/smbfs/request.c (99%) rename {fs => drivers/staging}/smbfs/request.h (100%) rename {include/linux => drivers/staging/smbfs}/smb.h (100%) rename {fs => drivers/staging}/smbfs/smb_debug.h (100%) rename {include/linux => drivers/staging/smbfs}/smb_fs.h (97%) rename {include/linux => drivers/staging/smbfs}/smb_fs_i.h (100%) rename {include/linux => drivers/staging/smbfs}/smb_fs_sb.h (98%) rename {include/linux => drivers/staging/smbfs}/smb_mount.h (100%) rename {Documentation/filesystems => drivers/staging/smbfs}/smbfs.txt (100%) rename {fs => drivers/staging}/smbfs/smbiod.c (98%) rename {include/linux => drivers/staging/smbfs}/smbno.h (100%) rename {fs => drivers/staging}/smbfs/sock.c (99%) rename {fs => drivers/staging}/smbfs/symlink.c (96%)Documentation/filesystems/00-INDEX +0
-2@@ -96,8 +96,6 @@ seq_file.txt - how to use the seq_file API sharedsubtree.txt - a description of shared subtrees for namespaces. -smbfs.txt - - info on using filesystems with the SMB protocol (Win 3.11 and NT). spufs.txt - info and mount options for the SPU filesystem used on Cell. sysfs-pci.txtDocumentation/ioctl/ioctl-number.txt +1
-1@@ -259,7 +259,7 @@ Code Seq#(hex) Include File Comments 't' 00-7F linux/if_ppp.h 't' 80-8F linux/isdn_ppp.h 't' 90 linux/toshiba.h -'u' 00-1F linux/smb_fs.h +'u' 00-1F linux/smb_fs.h gone 'v' all linux/videodev.h conflict! 'v' 00-1F linux/ext2_fs.h conflict! 'v' 00-1F linux/fs.h conflict!drivers/staging/Kconfig +2
-0@@ -149,6 +149,8 @@ source "drivers/staging/msm/Kconfig" source "drivers/staging/lirc/Kconfig" +source "drivers/staging/smbfs/Kconfig" + source "drivers/staging/easycap/Kconfig" source "drivers/staging/solo6x10/Kconfig"drivers/staging/Makefile +1
-0@@ -32,6 +32,7 @@ obj-$(CONFIG_AUTOFS_FS) += autofs/ obj-$(CONFIG_IDE_PHISON) += phison/ obj-$(CONFIG_LINE6_USB) += line6/ obj-$(CONFIG_USB_SERIAL_QUATECH2) += serqt_usb2/ +obj-$(CONFIG_SMB_FS) += smbfs/ obj-$(CONFIG_USB_SERIAL_QUATECH_USB2) += quatech_usb2/ obj-$(CONFIG_OCTEON_ETHERNET) += octeon/ obj-$(CONFIG_VT6655) += vt6655/drivers/staging/smbfs/Kconfig renamed from fs/smbfs/Kconfig +0
-0drivers/staging/smbfs/Makefile renamed from fs/smbfs/Makefile +0
-0drivers/staging/smbfs/TODO new file +8
-0@@ -0,0 +1,8 @@ +smbfs is on its way out of the kernel, it has been replaced +by cifs several years ago. + +The smbfs code uses the big kernel lock which +is getting deprecated. + +Users that find smbfs to work but not cifs should contact +the CIFS developers on [email protected].drivers/staging/smbfs/cache.c renamed from fs/smbfs/cache.c +1
-1@@ -13,12 +13,12 @@#include <linux/errno.h> #include <linux/kernel.h> #include <linux/mm.h> -#include <linux/smb_fs.h> #include <linux/pagemap.h> #include <linux/net.h> #include <asm/page.h> +#include "smb_fs.h" #include "smb_debug.h" #include "proto.h" drivers/staging/smbfs/dir.c renamed from fs/smbfs/dir.c +3
-3@@ -15,9 +15,9 @@#include <linux/net.h> #include <linux/sched.h> -#include <linux/smb_fs.h> -#include <linux/smb_mount.h> -#include <linux/smbno.h> +#include "smb_fs.h" +#include "smb_mount.h" +#include "smbno.h" #include "smb_debug.h" #include "proto.h" drivers/staging/smbfs/file.c renamed from fs/smbfs/file.c +2
-3@@ -21,9 +21,8 @@#include <asm/uaccess.h> #include <asm/system.h> -#include <linux/smbno.h> -#include <linux/smb_fs.h> - +#include "smbno.h" +#include "smb_fs.h" #include "smb_debug.h" #include "proto.h" drivers/staging/smbfs/getopt.c renamed from fs/smbfs/getopt.c +0
-0drivers/staging/smbfs/getopt.h renamed from fs/smbfs/getopt.h +0
-0drivers/staging/smbfs/inode.c renamed from fs/smbfs/inode.c +4
-4@@ -26,13 +26,13 @@#include <linux/vfs.h> #include <linux/highuid.h> #include <linux/sched.h> -#include <linux/smb_fs.h> -#include <linux/smbno.h> -#include <linux/smb_mount.h> #include <asm/system.h> #include <asm/uaccess.h> +#include "smb_fs.h" +#include "smbno.h" +#include "smb_mount.h" #include "smb_debug.h" #include "getopt.h" #include "proto.h" @@ -504,7 +504,7 @@ static int smb_fill_super(struct super_block *sb, void *raw_data, int silent)if (warn_count <5 ) { warn_count++;printk (KERN_EMERG "smbfs is deprecated and will be removed" -" from the 2.6.27 kernel. Please migrate to cifs\n" ); +" from the 2.6.37 kernel. Please migrate to cifs\n" ); }if (!raw_data)drivers/staging/smbfs/ioctl.c renamed from fs/smbfs/ioctl.c +2
-3@@ -16,11 +16,10 @@#include <linux/smp_lock.h> #include <linux/net.h> -#include <linux/smb_fs.h> -#include <linux/smb_mount.h> -#include <asm/uaccess.h> +#include "smb_fs.h" +#include "smb_mount.h" #include "proto.h" long drivers/staging/smbfs/proc.c renamed from fs/smbfs/proc.c +3
-4@@ -20,15 +20,14 @@#include <linux/smp_lock.h> #include <linux/net.h> #include <linux/vfs.h> -#include <linux/smb_fs.h> -#include <linux/smbno.h> -#include <linux/smb_mount.h> -#include <net/sock.h> #include <asm/string.h> #include <asm/div64.h> +#include "smb_fs.h" +#include "smbno.h" +#include "smb_mount.h" #include "smb_debug.h" #include "proto.h" #include "request.h" drivers/staging/smbfs/proto.h renamed from fs/smbfs/proto.h +0
-0drivers/staging/smbfs/request.c renamed from fs/smbfs/request.c +3
-4@@ -13,10 +13,9 @@#include <linux/net.h> #include <linux/sched.h> -#include <linux/smb_fs.h> -#include <linux/smbno.h> -#include <linux/smb_mount.h> - +#include "smb_fs.h" +#include "smbno.h" +#include "smb_mount.h" #include "smb_debug.h" #include "request.h" #include "proto.h" drivers/staging/smbfs/request.h renamed from fs/smbfs/request.h +0
-0drivers/staging/smbfs/smb.h renamed from include/linux/smb.h +0
-0drivers/staging/smbfs/smb_debug.h renamed from fs/smbfs/smb_debug.h +0
-0drivers/staging/smbfs/smb_fs.h renamed from include/linux/smb_fs.h +4
-4@@ -9,7 +9,7 @@#ifndef _LINUX_SMB_FS_H#define _LINUX_SMB_FS_H -#include <linux/smb.h> +#include "smb.h" /* * ioctl commands @@ -22,13 +22,13 @@#ifdef __KERNEL__ -#include <linux/smb_fs_i.h> -#include <linux/smb_fs_sb.h> +#include "smb_fs_i.h" +#include "smb_fs_sb.h" +#include "smb_mount.h" #include <linux/fs.h> #include <linux/pagemap.h> #include <linux/vmalloc.h> -#include <linux/smb_mount.h> #include <linux/jiffies.h> #include <asm/unaligned.h> drivers/staging/smbfs/smb_fs_i.h renamed from include/linux/smb_fs_i.h +0
-0drivers/staging/smbfs/smb_fs_sb.h renamed from include/linux/smb_fs_sb.h +1
-1@@ -11,7 +11,7 @@#include <linux/types.h> #include <linux/backing-dev.h> -#include <linux/smb.h> +#include "smb.h" /* * Upper limit on the total number of active smb_request structs. drivers/staging/smbfs/smb_mount.h renamed from include/linux/smb_mount.h +0
-0drivers/staging/smbfs/smbfs.txt renamed from Documentation/filesystems/smbfs.txt +0
-0drivers/staging/smbfs/smbiod.c renamed from fs/smbfs/smbiod.c +3
-4@@ -20,13 +20,12 @@#include <linux/kthread.h> #include <net/ip.h> -#include <linux/smb_fs.h> -#include <linux/smbno.h> -#include <linux/smb_mount.h> -#include <asm/system.h> #include <asm/uaccess.h> +#include "smb_fs.h" +#include "smbno.h" +#include "smb_mount.h" #include "smb_debug.h" #include "request.h" #include "proto.h" drivers/staging/smbfs/smbno.h renamed from include/linux/smbno.h +0
-0drivers/staging/smbfs/sock.c renamed from fs/smbfs/sock.c +3
-4@@ -22,13 +22,12 @@#include <net/tcp_states.h> #include <net/ip.h> -#include <linux/smb_fs.h> -#include <linux/smb.h> -#include <linux/smbno.h> -#include <asm/uaccess.h> #include <asm/ioctls.h> +#include "smb_fs.h" +#include "smb.h" +#include "smbno.h" #include "smb_debug.h" #include "proto.h" #include "request.h" drivers/staging/smbfs/symlink.c renamed from fs/smbfs/symlink.c +2
-3@@ -19,9 +19,8 @@#include <asm/uaccess.h> #include <asm/system.h> -#include <linux/smbno.h> -#include <linux/smb_fs.h> - +#include "smbno.h" +#include "smb_fs.h" #include "smb_debug.h" #include "proto.h" fs/Kconfig +0
-1@@ -233,7 +233,6 @@ config NFS_COMMON default y source "net/sunrpc/Kconfig" -source "fs/smbfs/Kconfig" source "fs/ceph/Kconfig" source "fs/cifs/Kconfig" source "fs/ncpfs/Kconfig"fs/Makefile +0
-1@@ -91,7 +91,6 @@ obj-$(CONFIG_NFSD) += nfsd/ obj-$(CONFIG_LOCKD) += lockd/ obj-$(CONFIG_NLS) += nls/ obj-$(CONFIG_SYSV_FS) += sysv/ -obj-$(CONFIG_SMB_FS) += smbfs/ obj-$(CONFIG_CIFS) += cifs/ obj-$(CONFIG_NCP_FS) += ncpfs/ obj-$(CONFIG_HPFS_FS) += hpfs/fs/compat.c +1
-30@@ -29,8 +29,6 @@#include <linux/vfs.h> #include <linux/ioctl.h> #include <linux/init.h> -#include <linux/smb.h> -#include <linux/smb_mount.h> #include <linux/ncp_mount.h> #include <linux/nfs4_mount.h> #include <linux/syscalls.h> @@ -745,30 +743,6 @@ static void *do_ncp_super_data_conv(void *raw_data)return raw_data; } -struct compat_smb_mount_data { -compat_int_t version; -__compat_uid_t mounted_uid; -__compat_uid_t uid; -__compat_gid_t gid; -compat_mode_t file_mode; -compat_mode_t dir_mode; -}; - -static void *do_smb_super_data_conv (void *raw_data) -{ -struct smb_mount_data *s = raw_data; -struct compat_smb_mount_data *c_s = raw_data; - -if (c_s->version !=SMB_MOUNT_OLDVERSION ) - goto out; - s->dir_mode = c_s->dir_mode; - s->file_mode = c_s->file_mode; - s->gid = c_s->gid; - s->uid = c_s->uid; - s->mounted_uid = c_s->mounted_uid; - out: -return raw_data; -}struct compat_nfs_string {compat_uint_t len;@@ -835,7 +809,6 @@ static int do_nfs4_super_data_conv(void *raw_data)return 0 ; } -#define SMBFS_NAME "smbfs"#define NCPFS_NAME "ncpfs"#define NFS4_NAME "nfs4"@@ -870,9 +843,7 @@ asmlinkage long compat_sys_mount(const char __user * dev_name, retval = -EINVAL ;if (kernel_type && data_page) { -if (!strcmp (kernel_type,SMBFS_NAME )) { -do_smb_super_data_conv ((void *)data_page); - }else if (!strcmp (kernel_type,NCPFS_NAME )) { +if (!strcmp (kernel_type,NCPFS_NAME )) {do_ncp_super_data_conv ((void *)data_page); }else if (!strcmp (kernel_type,NFS4_NAME )) {if (do_nfs4_super_data_conv ((void *) data_page))fs/compat_ioctl.c +0
-26@@ -46,7 +46,6 @@#include <linux/videodev.h> #include <linux/netdevice.h> #include <linux/raw.h> -#include <linux/smb_fs.h> #include <linux/blkdev.h> #include <linux/elevator.h> #include <linux/rtc.h> @@ -558,25 +557,6 @@ static int mt_ioctl_trans(unsigned int fd, unsigned int cmd, void __user *argp)#endif /* CONFIG_BLOCK */ -static int do_smb_getmountuid (unsigned int fd,unsigned int cmd, -compat_uid_t __user *argp) -{ -mm_segment_t old_fs =get_fs (); -__kernel_uid_t kuid; -int err; - - cmd =SMB_IOC_GETMOUNTUID ; - -set_fs (KERNEL_DS ); - err =sys_ioctl (fd, cmd, (unsigned long )&kuid); -set_fs (old_fs); - -if (err >=0 ) - err =put_user (kuid, argp); - -return err; -} -/* Bluetooth ioctls */ #define HCIUARTSETPROTO _IOW('U', 200, int)#define HCIUARTGETPROTO _IOR('U', 201, int)@@ -1265,8 +1245,6 @@ COMPATIBLE_IOCTL(OSS_GETVERSION)/* Raw devices */ COMPATIBLE_IOCTL(RAW_SETBIND) COMPATIBLE_IOCTL(RAW_GETBIND) -/* SMB ioctls which do not need any translations */ -COMPATIBLE_IOCTL(SMB_IOC_NEWCONN) /* Watchdog */ COMPATIBLE_IOCTL(WDIOC_GETSUPPORT) COMPATIBLE_IOCTL(WDIOC_GETSTATUS)@@ -1528,10 +1506,6 @@ static long do_ioctl_trans(int fd, unsigned int cmd,case RAW_GETBIND :return raw_ioctl (fd, cmd, argp);#endif -/* One SMB ioctl needs translations. */ -#define SMB_IOC_GETMOUNTUID_32 _IOR('u', 1, compat_uid_t) -case SMB_IOC_GETMOUNTUID_32 : -return do_smb_getmountuid (fd, cmd, argp);/* Serial */ case TIOCGSERIAL :case TIOCSSERIAL :include/linux/Kbuild +0
-0
include/linux/Kbuild header-y += serio.h · line 331
Quoted 10 lines
include/linux/Kbuild +0
-4@@ -326,10 +326,6 @@ header-y += serio.h header-y += shm.h header-y += signal.h header-y += signalfd.h -header-y += smb.h -header-y += smb_fs.h -header-y += smb_mount.h -header-y += smbno.h header-y += snmp.h header-y += socket.h header-y += sockios.h
Funny, I've recently been toying with the idea of resurrecting smbfs and updating its transport layer. That said, staging is certainly appropriate at this point.