mirror of
https://github.com/torvalds/linux.git
synced 2024-11-05 03:21:32 +00:00
b693855fe6
This allows directory listings to Mac to display filenames correctly which have been created with illegal (to Windows) characters in their filename. It does not allow converting the other direction yet ie opening files with these characters (followon patch). There are seven reserved characters that need to be remapped when mounting to Windows, Mac (or any server without Unix Extensions) which are valid in POSIX but not in the other OS. : \ < > ? * | We used the normal UCS-2 remap range for this in order to convert this to/from UTF8 as did Windows Services for Unix (basically add 0xF000 to any of the 7 reserved characters), at least when the "mapchars" mount option was specified. Mac used a very slightly different "Services for Mac" remap range 0xF021 through 0xF027. The attached patch allows cifs.ko (the kernel client) to read directories on macs containing files with these characters and display their names properly. In theory this even might be useful on mounts to Samba when the vfs_catia or new "vfs_fruit" module is loaded. Currently the 7 reserved characters look very strange in directory listings from cifs.ko to Mac server. This patch allows these file name characters to be read (requires specifying mapchars on mount). Two additional changes are needed: 1) Make it more automatic: a way of detecting enough info so that we know to try to always remap these characters or not. Various have suggested that the SFM approach be made the default when the server does not support POSIX Unix extensions (cifs mounts to Samba for example) so need to make SFM remapping the default unless mapchars (SFU style mapping) specified on mount or no mapping explicitly requested or no mapping needed (cifs mounts to Samba). 2) Adding a patch to map the characters the other direction (ie UTF-8 to UCS-2 on open). This patch does it for translating readdir entries (ie UCS-2 to UTF-8) Signed-off-by: Steve French <smfrench@gmail.com> Reviewed-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
72 lines
3.2 KiB
C
72 lines
3.2 KiB
C
/*
|
|
* fs/cifs/cifs_fs_sb.h
|
|
*
|
|
* Copyright (c) International Business Machines Corp., 2002,2004
|
|
* Author(s): Steve French (sfrench@us.ibm.com)
|
|
*
|
|
* This library is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License as published
|
|
* by the Free Software Foundation; either version 2.1 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
|
|
* the GNU Lesser General Public License for more details.
|
|
*
|
|
*/
|
|
#include <linux/rbtree.h>
|
|
|
|
#ifndef _CIFS_FS_SB_H
|
|
#define _CIFS_FS_SB_H
|
|
|
|
#include <linux/backing-dev.h>
|
|
|
|
#define CIFS_MOUNT_NO_PERM 1 /* do not do client vfs_perm check */
|
|
#define CIFS_MOUNT_SET_UID 2 /* set current's euid in create etc. */
|
|
#define CIFS_MOUNT_SERVER_INUM 4 /* inode numbers from uniqueid from server */
|
|
#define CIFS_MOUNT_DIRECT_IO 8 /* do not write nor read through page cache */
|
|
#define CIFS_MOUNT_NO_XATTR 0x10 /* if set - disable xattr support */
|
|
#define CIFS_MOUNT_MAP_SPECIAL_CHR 0x20 /* remap illegal chars in filenames */
|
|
#define CIFS_MOUNT_POSIX_PATHS 0x40 /* Negotiate posix pathnames if possible*/
|
|
#define CIFS_MOUNT_UNX_EMUL 0x80 /* Network compat with SFUnix emulation */
|
|
#define CIFS_MOUNT_NO_BRL 0x100 /* No sending byte range locks to srv */
|
|
#define CIFS_MOUNT_CIFS_ACL 0x200 /* send ACL requests to non-POSIX srv */
|
|
#define CIFS_MOUNT_OVERR_UID 0x400 /* override uid returned from server */
|
|
#define CIFS_MOUNT_OVERR_GID 0x800 /* override gid returned from server */
|
|
#define CIFS_MOUNT_DYNPERM 0x1000 /* allow in-memory only mode setting */
|
|
#define CIFS_MOUNT_NOPOSIXBRL 0x2000 /* mandatory not posix byte range lock */
|
|
#define CIFS_MOUNT_NOSSYNC 0x4000 /* don't do slow SMBflush on every sync*/
|
|
#define CIFS_MOUNT_FSCACHE 0x8000 /* local caching enabled */
|
|
#define CIFS_MOUNT_MF_SYMLINKS 0x10000 /* Minshall+French Symlinks enabled */
|
|
#define CIFS_MOUNT_MULTIUSER 0x20000 /* multiuser mount */
|
|
#define CIFS_MOUNT_STRICT_IO 0x40000 /* strict cache mode */
|
|
#define CIFS_MOUNT_RWPIDFORWARD 0x80000 /* use pid forwarding for rw */
|
|
#define CIFS_MOUNT_POSIXACL 0x100000 /* mirror of MS_POSIXACL in mnt_cifs_flags */
|
|
#define CIFS_MOUNT_CIFS_BACKUPUID 0x200000 /* backup intent bit for a user */
|
|
#define CIFS_MOUNT_CIFS_BACKUPGID 0x400000 /* backup intent bit for a group */
|
|
#define CIFS_MOUNT_MAP_SFM_CHR 0x800000 /* SFM/MAC mapping for illegal chars */
|
|
|
|
struct cifs_sb_info {
|
|
struct rb_root tlink_tree;
|
|
spinlock_t tlink_tree_lock;
|
|
struct tcon_link *master_tlink;
|
|
struct nls_table *local_nls;
|
|
unsigned int rsize;
|
|
unsigned int wsize;
|
|
unsigned long actimeo; /* attribute cache timeout (jiffies) */
|
|
atomic_t active;
|
|
kuid_t mnt_uid;
|
|
kgid_t mnt_gid;
|
|
kuid_t mnt_backupuid;
|
|
kgid_t mnt_backupgid;
|
|
umode_t mnt_file_mode;
|
|
umode_t mnt_dir_mode;
|
|
unsigned int mnt_cifs_flags;
|
|
char *mountdata; /* options received at mount time or via DFS refs */
|
|
struct backing_dev_info bdi;
|
|
struct delayed_work prune_tlinks;
|
|
struct rcu_head rcu;
|
|
};
|
|
#endif /* _CIFS_FS_SB_H */
|