Commit d1847c6c authored by Pavel Shilovsky's avatar Pavel Shilovsky

Remove rwpidforward from wine mount option for 3.0

parent 70843416
......@@ -460,7 +460,7 @@ A partial list of the supported mount options follows:
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.
wine Switch on pidforwardio+strictcache+forcemand.
wine Switch on strictcache+forcemand.
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
......
......@@ -452,8 +452,7 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m)
seq_printf(s, ",mfsymlinks");
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_FSCACHE)
seq_printf(s, ",fsc");
if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RWPIDFORWARD) &&
(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_STRICT_IO) &&
if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_STRICT_IO) &&
(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL))
seq_printf(s, ",wine");
......
......@@ -201,7 +201,7 @@ struct smb_vol {
bool mfsymlinks:1; /* use Minshall+French Symlinks */
bool multiuser:1;
bool rwpidforward:1; /* pid forward for read/write operations */
bool wine:1; /* switch on pidforwardio+strictcache+forcemand */
bool wine:1; /* switch on strictcache+forcemand */
unsigned int rsize;
unsigned int wsize;
bool sockopt_tcp_nodelay:1;
......
......@@ -1367,7 +1367,6 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
vol->wine = 1;
vol->strict_io = 1;
vol->mand_lock = 1;
vol->rwpidforward = 1;
} else if (strnicmp(data, "cifsacl", 7) == 0) {
vol->cifs_acl = 1;
} else if (strnicmp(data, "nocifsacl", 9) == 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment