git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devicetree/merge' into spi/merge
[pandora-kernel.git]
/
fs
/
cifs
/
netmisc.c
diff --git
a/fs/cifs/netmisc.c
b/fs/cifs/netmisc.c
index
9aad47a
..
8d9189f
100644
(file)
--- a/
fs/cifs/netmisc.c
+++ b/
fs/cifs/netmisc.c
@@
-899,8
+899,8
@@
map_smb_to_linux_error(struct smb_hdr *smb, int logErr)
}
/* else ERRHRD class errors or junk - return EIO */
}
/* else ERRHRD class errors or junk - return EIO */
- cFYI(1, "Mapping smb error code
%d
to POSIX err %d",
-
smberrcode
, rc);
+ cFYI(1, "Mapping smb error code
0x%x
to POSIX err %d",
+
le32_to_cpu(smb->Status.CifsError)
, rc);
/* generic corrective action e.g. reconnect SMB session on
* ERRbaduid could be added */
/* generic corrective action e.g. reconnect SMB session on
* ERRbaduid could be added */
@@
-916,14
+916,14
@@
unsigned int
smbCalcSize(struct smb_hdr *ptr)
{
return (sizeof(struct smb_hdr) + (2 * ptr->WordCount) +
smbCalcSize(struct smb_hdr *ptr)
{
return (sizeof(struct smb_hdr) + (2 * ptr->WordCount) +
- 2 /* size of the bcc field */ +
BCC
(ptr));
+ 2 /* size of the bcc field */ +
get_bcc
(ptr));
}
unsigned int
smbCalcSize_LE(struct smb_hdr *ptr)
{
return (sizeof(struct smb_hdr) + (2 * ptr->WordCount) +
}
unsigned int
smbCalcSize_LE(struct smb_hdr *ptr)
{
return (sizeof(struct smb_hdr) + (2 * ptr->WordCount) +
- 2 /* size of the bcc field */ +
le16_to_cpu(BCC_LE(ptr)
));
+ 2 /* size of the bcc field */ +
get_bcc_le(ptr
));
}
/* The following are taken from fs/ntfs/util.c */
}
/* The following are taken from fs/ntfs/util.c */