Skip to content

E
etercifs
Commit d79fa8f0 authored by Pavel Shilovsky's avatar Pavel Shilovsky
Browse files
Options

Pull from cifs-2.6 repo for 2.6.26

Implement WINE logic Fix losing locks during fork()
parent a9344dab
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 32 deletions
sources/2.6.26/cifs_fs_sb.h
View file @ d79fa8f0
......@@ -32,6 +32,7 @@
#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_WINE_MODE 0x8000 /* use pid forwarding for wine apps */
struct cifs_sb_info {
struct cifsTconInfo *tcon; /* primary mount */
......
sources/2.6.26/cifsfs.c
View file @ d79fa8f0
......@@ -365,6 +365,10 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m)
seq_printf(s, ",nocase");
if (cifs_sb->tcon->retry)
seq_printf(s, ",hard");
if (cifs_sb->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");
......@@ -372,6 +376,10 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m)
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_WINE_MODE)
seq_printf(s, ",wine");
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)
......@@ -615,7 +623,7 @@ static ssize_t cifs_sync_read(struct file *filp, char __user *buf, size_t len, l
return -ENOENT;
if (!CIFS_I(filp->f_path.dentry->d_inode)->clientCanCacheRead && !posix_locking) {
retval = cifs_lock(filp, F_GETLK, &pfLock);
retval = cifs_lock(filp, F_GETLK | CIFS_NOPOSIXBRL_READ, &pfLock);
if (retval < 0)
return (ssize_t)retval;
if (pfLock.fl_type == F_UNLCK)
......
sources/2.6.26/cifsglob.h
View file @ d79fa8f0
......@@ -298,6 +298,8 @@ struct cifsLockInfo {
__u8 type;
};
#define CIFS_NOPOSIXBRL_READ 64
/*
* One of these for each open instance of a file
*/
......
sources/2.6.26/cifsproto.h
View file @ d79fa8f0
......@@ -264,16 +264,16 @@ extern int CIFSSMBClose(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 int netfid, const u32 netpid, unsigned int count,
const __u64 lseek, unsigned int *nbytes, char **buf,
int *return_buf_type);
extern int CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon,
const int netfid, const unsigned int count,
const __u64 lseek, unsigned int *nbytes,
const char *buf, const char __user *ubuf,
const int long_op);
const int netfid, const u32 netpid,
const unsigned int count, const __u64 lseek,
unsigned int *nbytes, const char *buf,
const char __user *ubuf, const int long_op);
extern int CIFSSMBWrite2(const int xid, struct cifsTconInfo *tcon,
const int netfid, const unsigned int count,
const int netfid, const u32 netpid, const unsigned int count,
const __u64 offset, unsigned int *nbytes,
struct kvec *iov, const int nvec, const int long_op);
extern int CIFSGetSrvInodeNumber(const int xid, struct cifsTconInfo *tcon,
......
sources/2.6.26/cifssmb.c
View file @ d79fa8f0
......@@ -1428,8 +1428,8 @@ openRetry:
int
CIFSSMBRead(const int xid, struct cifsTconInfo *tcon, const int netfid,
const unsigned int count, const __u64 lseek, unsigned int *nbytes,
char **buf, int *pbuf_type)
const u32 netpid, const unsigned int count, const __u64 lseek,
unsigned int *nbytes, char **buf, int *pbuf_type)
{
int rc = -EACCES;
READ_REQ *pSMB = NULL;
......@@ -1450,6 +1450,9 @@ CIFSSMBRead(const int xid, struct cifsTconInfo *tcon, const int netfid,
if (rc)
return rc;
pSMB->hdr.Pid = cpu_to_le16((__u16)netpid);
pSMB->hdr.PidHigh = cpu_to_le16((__u16)(netpid >> 16));
/* tcon and ses pointer are checked in smb_init */
if (tcon->ses->server == NULL)
return -ECONNABORTED;
......@@ -1530,7 +1533,7 @@ CIFSSMBRead(const int xid, struct cifsTconInfo *tcon, const int netfid,
int
CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon,
const int netfid, const unsigned int count,
const int netfid, const u32 netpid, const unsigned int count,
const __u64 offset, unsigned int *nbytes, const char *buf,
const char __user *ubuf, const int long_op)
{
......@@ -1554,6 +1557,10 @@ CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon,
(void **) &pSMBr);
if (rc)
return rc;
pSMB->hdr.Pid = cpu_to_le16((__u16)netpid);
pSMB->hdr.PidHigh = cpu_to_le16((__u16)(netpid >> 16));
/* tcon and ses pointer are checked in smb_init */
if (tcon->ses->server == NULL)
return -ECONNABORTED;
......@@ -1637,7 +1644,7 @@ CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon,
int
CIFSSMBWrite2(const int xid, struct cifsTconInfo *tcon,
const int netfid, const unsigned int count,
const int netfid, const u32 netpid, const unsigned int count,
const __u64 offset, unsigned int *nbytes, struct kvec *iov,
int n_vec, const int long_op)
{
......@@ -1656,6 +1663,10 @@ CIFSSMBWrite2(const int xid, struct cifsTconInfo *tcon,
rc = small_smb_init(SMB_COM_WRITE_ANDX, wct, tcon, (void **) &pSMB);
if (rc)
return rc;
pSMB->hdr.Pid = cpu_to_le16((__u16)netpid);
pSMB->hdr.PidHigh = cpu_to_le16((__u16)(netpid >> 16));
/* tcon and ses pointer are checked in smb_init */
if (tcon->ses->server == NULL)
return -ECONNABORTED;
......
sources/2.6.26/connect.c
View file @ d79fa8f0
......@@ -91,6 +91,7 @@ struct smb_vol {
bool nobrl:1; /* disable sending byte range locks to srv */
bool mand_lock:1; /* send mandatory not posix byte range lock reqs */
bool seal:1; /* request transport encryption on share */
bool wine_mode:1;
unsigned int rsize;
unsigned int wsize;
unsigned int sockopt;
......@@ -1268,6 +1269,10 @@ cifs_parse_mount_options(char *options, const char *devname,
vol->server_ino = 1;
} else if (strnicmp(data, "noserverino", 9) == 0) {
vol->server_ino = 0;
} else if (strnicmp(data, "wine", 4) == 0) {
vol->wine_mode = 1;
vol->mand_lock = 1;
vol->direct_io = 1;
} else if (strnicmp(data, "cifsacl", 7) == 0) {
vol->cifs_acl = 1;
} else if (strnicmp(data, "nocifsacl", 9) == 0) {
......@@ -2111,6 +2116,8 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_UNX_EMUL;
if (volume_info.nobrl)
cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_NO_BRL;
if (volume_info.wine_mode)
cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_WINE_MODE;
if (volume_info.mand_lock)
cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_NOPOSIXBRL;
if (volume_info.cifs_acl)
......
sources/2.6.26/dir.c
View file @ d79fa8f0
......@@ -428,7 +428,7 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, int mode,
pdev->minor =
cpu_to_le64(MINOR(device_number));
rc = CIFSSMBWrite(xid, pTcon,
fileHandle,
fileHandle, current->tgid,
sizeof(struct win_dev),
0, &bytes_written, (char *)pdev,
NULL, 0);
......@@ -439,7 +439,7 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, int mode,
pdev->minor =
cpu_to_le64(MINOR(device_number));
rc = CIFSSMBWrite(xid, pTcon,
fileHandle,
fileHandle, current->tgid,
sizeof(struct win_dev),
0, &bytes_written, (char *)pdev,
NULL, 0);
......
sources/2.6.26/file.c
View file @ d79fa8f0
......@@ -705,9 +705,16 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock)
FreeXid(xid);
return -EBADF;
}
netpid = ((struct cifsFileInfo *)file->private_data)->pid;
netfid = ((struct cifsFileInfo *)file->private_data)->netfid;
if ((cmd & CIFS_NOPOSIXBRL_READ) &&
(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_WINE_MODE))
netpid = ((struct cifsFileInfo *)file->private_data)->pid;
else
netpid = current->tgid;
cmd &= ~CIFS_NOPOSIXBRL_READ;
if ((pTcon->ses->capabilities & CAP_UNIX) &&
(CIFS_UNIX_FCNTL_CAP & le64_to_cpu(pTcon->fsUnixInfo.Capability)) &&
((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL) == 0))
......@@ -830,9 +837,10 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock)
1, 0, li->type, false);
if (stored_rc)
rc = stored_rc;
list_del(&li->llist);
kfree(li);
else {
list_del(&li->llist);
kfree(li);
}
}
}
mutex_unlock(&fid->lock_mutex);
......@@ -855,6 +863,7 @@ ssize_t cifs_user_write(struct file *file, const char __user *write_data,
struct cifsTconInfo *pTcon;
int xid, long_op;
struct cifsFileInfo *open_file;
__u32 netpid;
cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);
......@@ -868,6 +877,11 @@ ssize_t cifs_user_write(struct file *file, const char __user *write_data,
return -EBADF;
open_file = (struct cifsFileInfo *) file->private_data;
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_WINE_MODE)
netpid = open_file->pid;
else
netpid = current->tgid;
rc = generic_write_checks(file, poffset, &write_size, 0);
if (rc)
return rc;
......@@ -909,7 +923,7 @@ ssize_t cifs_user_write(struct file *file, const char __user *write_data,
}
rc = CIFSSMBWrite(xid, pTcon,
open_file->netfid,
open_file->netfid, netpid,
min_t(const int, cifs_sb->wsize,
write_size - total_written),
*poffset, &bytes_written,
......@@ -959,6 +973,7 @@ static ssize_t cifs_write(struct file *file, const char *write_data,
struct cifsTconInfo *pTcon;
int xid, long_op;
struct cifsFileInfo *open_file;
__u32 netpid;
cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);
......@@ -971,6 +986,11 @@ static ssize_t cifs_write(struct file *file, const char *write_data,
return -EBADF;
open_file = (struct cifsFileInfo *)file->private_data;
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_WINE_MODE)
netpid = open_file->pid;
else
netpid = current->tgid;
xid = GetXid();
if (*poffset > file->f_path.dentry->d_inode->i_size)
......@@ -1021,12 +1041,13 @@ static ssize_t cifs_write(struct file *file, const char *write_data,
total_written;
iov[1].iov_len = len;
rc = CIFSSMBWrite2(xid, pTcon,
open_file->netfid, len,
open_file->netfid,
netpid, len,
*poffset, &bytes_written,
iov, 1, long_op);
} else
rc = CIFSSMBWrite(xid, pTcon,
open_file->netfid,
open_file->netfid, netpid,
min_t(const int, cifs_sb->wsize,
write_size - total_written),
*poffset, &bytes_written,
......@@ -1251,6 +1272,7 @@ static int cifs_writepages(struct address_space *mapping,
int rc = 0;
int scanned = 0;
int xid;
__u32 netpid;
cifs_sb = CIFS_SB(mapping->host->i_sb);
......@@ -1390,12 +1412,17 @@ retry:
* we used to still be valid
*/
open_file = find_writable_file(CIFS_I(mapping->host));
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_WINE_MODE)
netpid = open_file->pid;
else
netpid = current->tgid;
if (!open_file) {
cERROR(1, ("No writable handles for inode"));
rc = -EBADF;
} else {
rc = CIFSSMBWrite2(xid, cifs_sb->tcon,
open_file->netfid,
open_file->netfid, netpid,
bytes_to_write, offset,
&bytes_written, iov, n_iov,
CIFS_LONG_OP);
......@@ -1620,6 +1647,7 @@ ssize_t cifs_user_read(struct file *file, char __user *read_data,
char *smb_read_data;
char __user *current_offset;
struct smb_com_read_rsp *pSMBr;
__u32 netpid;
xid = GetXid();
cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);
......@@ -1631,6 +1659,11 @@ ssize_t cifs_user_read(struct file *file, char __user *read_data,
}
open_file = (struct cifsFileInfo *)file->private_data;
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_WINE_MODE)
netpid = open_file->pid;
else
netpid = current->tgid;
if ((file->f_flags & O_ACCMODE) == O_WRONLY)
cFYI(1, ("attempting read on write only file instance"));
......@@ -1650,7 +1683,7 @@ ssize_t cifs_user_read(struct file *file, char __user *read_data,
break;
}
rc = CIFSSMBRead(xid, pTcon,
open_file->netfid,
open_file->netfid, netpid,
current_read_size, *poffset,
&bytes_read, &smb_read_data,
&buf_type);
......@@ -1700,6 +1733,7 @@ static ssize_t cifs_read(struct file *file, char *read_data, size_t read_size,
char *current_offset;
struct cifsFileInfo *open_file;
int buf_type = CIFS_NO_BUFFER;
__u32 netpid;
xid = GetXid();
cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);
......@@ -1711,6 +1745,11 @@ static ssize_t cifs_read(struct file *file, char *read_data, size_t read_size,
}
open_file = (struct cifsFileInfo *)file->private_data;
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_WINE_MODE)
netpid = open_file->pid;
else
netpid = current->tgid;
if ((file->f_flags & O_ACCMODE) == O_WRONLY)
cFYI(1, ("attempting read on write only file instance"));
......@@ -1735,7 +1774,7 @@ static ssize_t cifs_read(struct file *file, char *read_data, size_t read_size,
break;
}
rc = CIFSSMBRead(xid, pTcon,
open_file->netfid,
open_file->netfid, netpid,
current_read_size, *poffset,
&bytes_read, &current_offset,
&buf_type);
......@@ -1837,6 +1876,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping,
struct pagevec lru_pvec;
struct cifsFileInfo *open_file;
int buf_type = CIFS_NO_BUFFER;
__u32 netpid;
xid = GetXid();
if (file->private_data == NULL) {
......@@ -1847,6 +1887,11 @@ static int cifs_readpages(struct file *file, struct address_space *mapping,
cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);
pTcon = cifs_sb->tcon;
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_WINE_MODE)
netpid = open_file->pid;
else
netpid = current->tgid;
pagevec_init(&lru_pvec, 0);
cFYI(DBG2, ("rpages: num pages %d", num_pages));
for (i = 0; i < num_pages; ) {
......@@ -1893,10 +1938,9 @@ static int cifs_readpages(struct file *file, struct address_space *mapping,
}
rc = CIFSSMBRead(xid, pTcon,
open_file->netfid,
read_size, offset,
&bytes_read, &smb_read_data,
&buf_type);
open_file->netfid, netpid,
read_size, offset, &bytes_read,
&smb_read_data, &buf_type);
/* BB more RC checks ? */
if (rc == -EAGAIN) {
if (smb_read_data) {
......
sources/2.6.26/inode.c
View file @ d79fa8f0
......@@ -303,7 +303,7 @@ static int decode_sfu_inode(struct inode *inode, __u64 size,
int buf_type = CIFS_NO_BUFFER;
/* Read header */
rc = CIFSSMBRead(xid, pTcon,
netfid,
netfid, current->tgid,
24 /* length */, 0 /* offset */,
&bytes_read, &pbuf, &buf_type);
if ((rc == 0) && (bytes_read >= 8)) {
......@@ -1487,8 +1487,8 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs)
cFYI(1, ("SetFSize for attrs rc = %d", rc));
if ((rc == -EINVAL) || (rc == -EOPNOTSUPP)) {
unsigned int bytes_written;
rc = CIFSSMBWrite(xid, pTcon,
nfid, 0, attrs->ia_size,
rc = CIFSSMBWrite(xid, pTcon, nfid,
npid, 0, attrs->ia_size,
&bytes_written, NULL, NULL,
1 /* 45 seconds */);
cFYI(1, ("Wrt seteof rc %d", rc));
......@@ -1520,8 +1520,8 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs)
if (rc == 0) {
unsigned int bytes_written;
rc = CIFSSMBWrite(xid, pTcon,
netfid, 0,
attrs->ia_size,
netfid, current->tgid,
0, attrs->ia_size,
&bytes_written, NULL,
NULL, 1 /* 45 sec */);
cFYI(1, ("wrt seteof rc %d", rc));
......
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