Commit 5bdf45fe authored by Steve French's avatar Steve French

Merge bk://cifs.bkbits.net/linux-2.5cifs

into stevef95.austin.ibm.com:/home/stevef/linux-2.5cifs
parents f051a69f e5a0a002
...@@ -739,7 +739,7 @@ CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon, ...@@ -739,7 +739,7 @@ CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon,
rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
(struct smb_hdr *) pSMBr, &bytes_returned, long_op); (struct smb_hdr *) pSMBr, &bytes_returned, long_op);
if (rc) { if (rc) {
cERROR(1, ("Send error in write = %d", rc)); cFYI(1, ("Send error in write = %d", rc));
*nbytes = 0; *nbytes = 0;
} else } else
*nbytes = le16_to_cpu(pSMBr->Count); *nbytes = le16_to_cpu(pSMBr->Count);
...@@ -803,7 +803,7 @@ CIFSSMBLock(const int xid, struct cifsTconInfo *tcon, ...@@ -803,7 +803,7 @@ CIFSSMBLock(const int xid, struct cifsTconInfo *tcon,
(struct smb_hdr *) pSMBr, &bytes_returned, timeout); (struct smb_hdr *) pSMBr, &bytes_returned, timeout);
if (rc) { if (rc) {
cERROR(1, ("Send error in Lock = %d", rc)); cFYI(1, ("Send error in Lock = %d", rc));
} }
if (pSMB) if (pSMB)
cifs_buf_release(pSMB); cifs_buf_release(pSMB);
......
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