Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 12067
b: refs/heads/master
c: 5e1253b
h: refs/heads/master
i:
  12065: 2f5ba30
  12063: eb7a203
v: v3
  • Loading branch information
Steve French committed Oct 10, 2005
1 parent f4a7b71 commit c3c7950
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 02c37a6df558fb8768c4c8ae792e86e9abf2d733
refs/heads/master: 5e1253b50111220f06ee13bc4e555d89ff39176b
19 changes: 17 additions & 2 deletions trunk/fs/cifs/cifsfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -407,9 +407,24 @@ static struct quotactl_ops cifs_quotactl_ops = {

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;
}
Expand Down
3 changes: 3 additions & 0 deletions trunk/fs/cifs/transport.c
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,8 @@ smb_send(struct socket *ssocket, struct smb_hdr *smb_buffer,
}
if (rc < 0)
break;
else
i = 0; /* reset i after each successful send */
iov.iov_base += rc;
iov.iov_len -= rc;
len -= rc;
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit c3c7950

Please sign in to comment.