diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
| commit | c9c06167e7933d93a6e396174c68abf242294abb (patch) | |
| tree | d9a8bb30663e9a3405a1ef37ffb62bc14b9f019f /fs/ncpfs | |
| parent | f79e8cc3c34e4192a3e5ef4cc9c6542fdef703c0 (diff) | |
Merge with Linux 2.4.0-test12.
Diffstat (limited to 'fs/ncpfs')
| -rw-r--r-- | fs/ncpfs/Config.in | 2 | ||||
| -rw-r--r-- | fs/ncpfs/ioctl.c | 4 | ||||
| -rw-r--r-- | fs/ncpfs/ncplib_kernel.h | 6 |
3 files changed, 2 insertions, 10 deletions
diff --git a/fs/ncpfs/Config.in b/fs/ncpfs/Config.in index 104f5a3c7..1f1eb1278 100644 --- a/fs/ncpfs/Config.in +++ b/fs/ncpfs/Config.in @@ -7,7 +7,5 @@ dep_mbool ' Clear remove/delete inhibit when needed' CONFIG_NCPFS_STRONG $CONFI dep_mbool ' Use NFS namespace if available' CONFIG_NCPFS_NFS_NS $CONFIG_NCP_FS dep_mbool ' Use LONG (OS/2) namespace if available' CONFIG_NCPFS_OS2_NS $CONFIG_NCP_FS dep_mbool ' Lowercase DOS filenames' CONFIG_NCPFS_SMALLDOS $CONFIG_NCP_FS -dep_mbool ' Allow mounting of volume subdirectories' CONFIG_NCPFS_MOUNT_SUBDIR $CONFIG_NCP_FS -dep_mbool ' NDS authentication support' CONFIG_NCPFS_NDS_DOMAINS $CONFIG_NCP_FS dep_mbool ' Use Native Language Support' CONFIG_NCPFS_NLS $CONFIG_NCP_FS dep_mbool ' Enable symbolic links and execute flags' CONFIG_NCPFS_EXTRAS $CONFIG_NCP_FS diff --git a/fs/ncpfs/ioctl.c b/fs/ncpfs/ioctl.c index 4b6afe2e9..37c87f8b2 100644 --- a/fs/ncpfs/ioctl.c +++ b/fs/ncpfs/ioctl.c @@ -165,7 +165,6 @@ int ncp_ioctl(struct inode *inode, struct file *filp, return 0; } -#ifdef CONFIG_NCPFS_MOUNT_SUBDIR case NCP_IOC_GETROOT: { struct ncp_setroot_ioctl sr; @@ -241,7 +240,6 @@ int ncp_ioctl(struct inode *inode, struct file *filp, return 0; } -#endif /* CONFIG_NCPFS_MOUNT_SUBDIR */ #ifdef CONFIG_NCPFS_PACKET_SIGNING case NCP_IOC_SIGN_INIT: @@ -374,7 +372,6 @@ outrel: } #endif /* CONFIG_NCPFS_IOCTL_LOCKING */ -#ifdef CONFIG_NCPFS_NDS_DOMAINS case NCP_IOC_GETOBJECTNAME: if (current->uid != server->m.mounted_uid) { return -EACCES; @@ -503,7 +500,6 @@ outrel: if (old) ncp_kfree_s(old, oldlen); return 0; } -#endif /* CONFIG_NCPFS_NDS_DOMAINS */ #ifdef CONFIG_NCPFS_NLS /* Here we are select the iocharset and the codepage for NLS. diff --git a/fs/ncpfs/ncplib_kernel.h b/fs/ncpfs/ncplib_kernel.h index 6d07ead73..162c89b4b 100644 --- a/fs/ncpfs/ncplib_kernel.h +++ b/fs/ncpfs/ncplib_kernel.h @@ -96,16 +96,14 @@ ncp_ClearPhysicalRecord(struct ncp_server *server, __u32 offset, __u32 length); #endif /* CONFIG_NCPFS_IOCTL_LOCKING */ -#ifdef CONFIG_NCPFS_MOUNT_SUBDIR int ncp_mount_subdir(struct ncp_server *, struct nw_info_struct *, __u8, __u8, __u32); -#endif /* CONFIG_NCPFS_MOUNT_SUBDIR */ #ifdef CONFIG_NCPFS_NLS -inline unsigned char ncp__tolower(struct nls_table *, unsigned char); -inline unsigned char ncp__toupper(struct nls_table *, unsigned char); +unsigned char ncp__tolower(struct nls_table *, unsigned char); +unsigned char ncp__toupper(struct nls_table *, unsigned char); int ncp__io2vol(struct ncp_server *, unsigned char *, unsigned int *, const unsigned char *, unsigned int, int); int ncp__vol2io(struct ncp_server *, unsigned char *, unsigned int *, |