[CIFS] Add mount option for disabling sending byte range lock requests (c46fa8ac) · Commits · e / devices / android_kernel_teracube_2e

fs/cifs/CHANGES

+8 −0

Original line number	Original line	Diff line number	Diff line
			Version 1.36
			------------
			Add mount option for disabling the default behavior of sending byte range lock
			requests to the server (necessary for certain applications which break with
			mandatory lock behavior such as Evolution), and also mount option for
			requesting case insensitive matching for path based requests (requesting
			case sensitive is the default).

	Version 1.35		Version 1.35
	------------		------------
	Add writepage performance improvements. Fix path name conversions		Add writepage performance improvements. Fix path name conversions

fs/cifs/README

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -407,6 +407,13 @@ A partial list of the supported mount options follows:
	This has no effect if the server does not support		This has no effect if the server does not support
	Unicode on the wire.		Unicode on the wire.
	nomapchars Do not translate any of these seven characters (default).		nomapchars Do not translate any of these seven characters (default).
			nocase Request case insensitive path name matching (case
			sensitive is the default if the server suports it).
			nobrl Do not send byte range lock requests to the server.
			This is necessary for certain applications that break
			with cifs style mandatory byte range locks (and most
			cifs servers do not yet support requesting advisory
			byte range locks).
	remount remount the share (often used to change from ro to rw mounts		remount remount the share (often used to change from ro to rw mounts
	or vice versa)		or vice versa)

fs/cifs/cifs_fs_sb.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26,6 +26,8 @@
	#define CIFS_MOUNT_MAP_SPECIAL_CHR 0x20 /* remap illegal chars in filenames */		#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_POSIX_PATHS 0x40 /* Negotiate posix pathnames if possible. */
	#define CIFS_MOUNT_UNX_EMUL 0x80 /* Network compat with SFUnix emulation */		#define CIFS_MOUNT_UNX_EMUL 0x80 /* Network compat with SFUnix emulation */
			#define CIFS_MOUNT_CASE_INSENS 0x100 /* Request case insenstive searches */
			#define CIFS_MOUNT_NO_BRL 0x200 /* No sending byte range locks to srv */

	struct cifs_sb_info {		struct cifs_sb_info {
	struct cifsTconInfo tcon; / primary mount */		struct cifsTconInfo tcon; / primary mount */

fs/cifs/cifsfs.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -96,5 +96,5 @@ extern ssize_t cifs_getxattr(struct dentry , const char , void *, size_t);
	extern ssize_t cifs_listxattr(struct dentry , char , size_t);		extern ssize_t cifs_listxattr(struct dentry , char , size_t);
	extern int cifs_ioctl (struct inode * inode, struct file * filep,		extern int cifs_ioctl (struct inode * inode, struct file * filep,
	unsigned int command, unsigned long arg);		unsigned int command, unsigned long arg);
	#define CIFS_VERSION "1.35"		#define CIFS_VERSION "1.36"
	#endif /* _CIFSFS_H */		#endif /* _CIFSFS_H */

fs/cifs/connect.c

+13 −1

Original line number	Original line	Diff line number	Diff line
	@@ -79,6 +79,8 @@ struct smb_vol {
	unsigned remap:1; /* set to remap seven reserved chars in filenames */		unsigned remap:1; /* set to remap seven reserved chars in filenames */
	unsigned posix_paths:1; /* unset to not ask for posix pathnames. */		unsigned posix_paths:1; /* unset to not ask for posix pathnames. */
	unsigned sfu_emul:1;		unsigned sfu_emul:1;
			unsigned nocase; /* request case insensitive filenames */
			unsigned nobrl; /* disable sending byte range locks to srv */
	unsigned int rsize;		unsigned int rsize;
	unsigned int wsize;		unsigned int wsize;
	unsigned int sockopt;		unsigned int sockopt;
	@@ -1040,6 +1042,12 @@ cifs_parse_mount_options(char options, const char devname,struct smb_vol *vol)
	vol->posix_paths = 1;		vol->posix_paths = 1;
	} else if (strnicmp(data, "noposixpaths", 12) == 0) {		} else if (strnicmp(data, "noposixpaths", 12) == 0) {
	vol->posix_paths = 0;		vol->posix_paths = 0;
			} else if (strnicmp(data, "nocase", 6) == 0) {
			vol->nocase = 1;
			} else if (strnicmp(data, "brl", 3) == 0) {
			vol->nobrl = 0;
			} else if (strnicmp(data, "nobrl", 5) == 0) {
			vol->nobrl = 1;
	} else if (strnicmp(data, "setuids", 7) == 0) {		} else if (strnicmp(data, "setuids", 7) == 0) {
	vol->setuids = 1;		vol->setuids = 1;
	} else if (strnicmp(data, "nosetuids", 9) == 0) {		} else if (strnicmp(data, "nosetuids", 9) == 0) {
	@@ -1699,9 +1707,13 @@ cifs_mount(struct super_block sb, struct cifs_sb_info cifs_sb,
	cifs_sb->mnt_cifs_flags \|= CIFS_MOUNT_NO_XATTR;		cifs_sb->mnt_cifs_flags \|= CIFS_MOUNT_NO_XATTR;
	if(volume_info.sfu_emul)		if(volume_info.sfu_emul)
	cifs_sb->mnt_cifs_flags \|= CIFS_MOUNT_UNX_EMUL;		cifs_sb->mnt_cifs_flags \|= CIFS_MOUNT_UNX_EMUL;
			if(volume_info.nocase)
			cifs_sb->mnt_cifs_flags \|= CIFS_MOUNT_CASE_INSENS;
			if(volume_info.nobrl)
			cifs_sb->mnt_cifs_flags \|= CIFS_MOUNT_NO_BRL;

	if(volume_info.direct_io) {		if(volume_info.direct_io) {
	cERROR(1,("mounting share using direct i/o"));		cFYI(1,("mounting share using direct i/o"));
	cifs_sb->mnt_cifs_flags \|= CIFS_MOUNT_DIRECT_IO;		cifs_sb->mnt_cifs_flags \|= CIFS_MOUNT_DIRECT_IO;
	}		}