diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-02-15 16:26:41 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-02-15 16:26:41 +0900 |
| commit | d60cf53a30956e47919788b2ef49287786a959c9 (patch) | |
| tree | cb518d7cc4813f4b54a3fd5fcaad43e6d82be6a3 /fs/cifs/cifssmb.c | |
| parent | 0ce08870b8a4895044b6cf2bbdc774a6faaa3656 (diff) | |
| parent | 13c12a4e8ecdf3998cd2d89ade69f6f194819c95 (diff) | |
| download | talos-obmc-linux-d60cf53a30956e47919788b2ef49287786a959c9.tar.gz talos-obmc-linux-d60cf53a30956e47919788b2ef49287786a959c9.zip | |
Merge branch 'sh/st-integration' into sh/urgent
Diffstat (limited to 'fs/cifs/cifssmb.c')
| -rw-r--r-- | fs/cifs/cifssmb.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index 3106f5e5c633..904aa47e3515 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -136,9 +136,6 @@ cifs_reconnect_tcon(struct cifsTconInfo *tcon, int smb_command) } } - if (ses->status == CifsExiting) - return -EIO; - /* * Give demultiplex thread up to 10 seconds to reconnect, should be * greater than cifs socket timeout which is 7 seconds @@ -156,7 +153,7 @@ cifs_reconnect_tcon(struct cifsTconInfo *tcon, int smb_command) * retrying until process is killed or server comes * back on-line */ - if (!tcon->retry || ses->status == CifsExiting) { + if (!tcon->retry) { cFYI(1, "gave up waiting on reconnect in smb_init"); return -EHOSTDOWN; } @@ -4914,7 +4911,6 @@ CIFSSMBSetFileSize(const int xid, struct cifsTconInfo *tcon, __u64 size, __u16 fid, __u32 pid_of_opener, bool SetAllocation) { struct smb_com_transaction2_sfi_req *pSMB = NULL; - char *data_offset; struct file_end_of_file_info *parm_data; int rc = 0; __u16 params, param_offset, offset, byte_count, count; @@ -4938,8 +4934,6 @@ CIFSSMBSetFileSize(const int xid, struct cifsTconInfo *tcon, __u64 size, param_offset = offsetof(struct smb_com_transaction2_sfi_req, Fid) - 4; offset = param_offset + params; - data_offset = (char *) (&pSMB->hdr.Protocol) + offset; - count = sizeof(struct file_end_of_file_info); pSMB->MaxParameterCount = cpu_to_le16(2); /* BB find exact max SMB PDU from sess structure BB */ |
