Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4ffff1f authored by Pavel Shilovsky's avatar Pavel Shilovsky Committed by Steve French
Browse files

CIFS: Add rwpidforward mount option 



Add rwpidforward mount option that switches on a mode when we forward
pid of a process who opened a file to any read and write operation.

This can prevent applications like WINE from failing on read or write
operation on a previously locked file region from the same netfd from
another process if we use mandatory brlock style.

It is actual for WINE because during a run of WINE program two processes
work on the same netfd - share the same file struct between several VFS
fds:
1) WINE-server does open and lock;
2) WINE-application does read and write.

Signed-off-by: default avatarPavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 25c7f41e

fs/cifs/README

+3 −0
Original line number Diff line number Diff line
@@ -457,6 +457,9 @@ A partial list of the supported mount options follows: 
		otherwise - read from the server. All written data are stored

		in the cache, but if the client doesn't have Exclusive Oplock,

		it writes the data to the server.

  rwpidforward  Forward pid of a process who opened a file to any read or write

		operation on that file. This prevent applications like WINE

		from failing on read and write if we use mandatory brlock style.

  acl   	Allow setfacl and getfacl to manage posix ACLs if server

		supports them.  (default)

  noacl 	Do not allow setfacl and getfacl calls on this mount

fs/cifs/cifs_fs_sb.h

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#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 */



struct cifs_sb_info {

	struct rb_root tlink_tree;

fs/cifs/cifsfs.c

+8 −0
Original line number Diff line number Diff line
@@ -415,12 +415,20 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m) 
		seq_printf(s, ",nocase");

	if (tcon->retry)

		seq_printf(s, ",hard");

	if (tcon->unix_ext)

		seq_printf(s, ",unix");

	else

		seq_printf(s, ",nounix");

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS)

		seq_printf(s, ",posixpaths");

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID)

		seq_printf(s, ",setuids");

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM)

		seq_printf(s, ",serverino");

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RWPIDFORWARD)

		seq_printf(s, ",rwpidforward");

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL)

		seq_printf(s, ",forcemand");

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DIRECT_IO)

		seq_printf(s, ",directio");

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_XATTR)

fs/cifs/cifsglob.h

+1 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ struct smb_vol { 
	bool fsc:1;	/* enable fscache */

	bool mfsymlinks:1; /* use Minshall+French Symlinks */

	bool multiuser:1;

	bool rwpidforward:1; /* pid forward for read/write operations */

	unsigned int rsize;

	unsigned int wsize;

	bool sockopt_tcp_nodelay:1;

fs/cifs/cifsproto.h

+2 −3
Original line number Diff line number Diff line
@@ -345,9 +345,8 @@ extern int CIFSSMBClose(const int xid, struct cifsTconInfo *tcon, 
extern int CIFSSMBFlush(const int xid, struct cifsTconInfo *tcon,

			const int smb_file_id);



extern int CIFSSMBRead(const int xid, struct cifsTconInfo *tcon,

			const int netfid, unsigned int count,

			const __u64 lseek, unsigned int *nbytes, char **buf,

extern int CIFSSMBRead(const int xid, struct cifs_io_parms *io_parms,

			unsigned int *nbytes, char **buf,

			int *return_buf_type);

extern int CIFSSMBWrite(const int xid, struct cifs_io_parms *io_parms,

			unsigned int *nbytes, const char *buf,