提交 5e1253b5 编写于 作者: S Steve French

[CIFS] Correct cifs tcp retry when some data sent before getting EAGAIN.

Continue implementation of cifs umount begin to allow force unmounts of
cifs mounts.
Signed-off-by: NSteve French <sfrench@us.ibm.com>
上级 02c37a6d
...@@ -407,9 +407,24 @@ static struct quotactl_ops cifs_quotactl_ops = { ...@@ -407,9 +407,24 @@ static struct quotactl_ops cifs_quotactl_ops = {
static void cifs_umount_begin(struct super_block * sblock) static void cifs_umount_begin(struct super_block * sblock)
{ {
cERROR(1,("kill all tasks now - umount begin not implemented yet")); struct cifs_sb_info *cifs_sb;
/* BB FIXME - finish BB */ cifs_sb = CIFS_SB(sb);
if(cifs_sb == NULL)
return -EIO;
if(cifs_sb->tcon == NULL)
return -EIO;
down(&tcon->tconSem);
if (atomic_read(&tcon->useCount) == 1)
tcon->tidStatus = CifsExiting;
up(&tcon->tconSem);
if((cifs->sb->tcon->ses) && (cifs_sb->tcon->ses->server))
{
cERROR(1,("wake up tasks now - umount begin not complete"));
wake_up_all(&server->request_q);
}
/* BB FIXME - finish add checks for tidStatus BB */
return; return;
} }
......
...@@ -169,6 +169,8 @@ smb_send(struct socket *ssocket, struct smb_hdr *smb_buffer, ...@@ -169,6 +169,8 @@ smb_send(struct socket *ssocket, struct smb_hdr *smb_buffer,
} }
if (rc < 0) if (rc < 0)
break; break;
else
i = 0; /* reset i after each successful send */
iov.iov_base += rc; iov.iov_base += rc;
iov.iov_len -= rc; iov.iov_len -= rc;
len -= rc; len -= rc;
...@@ -263,6 +265,7 @@ smb_send2(struct socket *ssocket, struct kvec *iov, int n_vec, ...@@ -263,6 +265,7 @@ smb_send2(struct socket *ssocket, struct kvec *iov, int n_vec,
} }
} }
} }
i = 0; /* in case we get ENOSPC on the next send */
} }
if (rc < 0) { if (rc < 0) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册