leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6

Browse Source 
Pull CIFS fixes from Steve French.

* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
  CIFS: Fix endianness conversion
  CIFS: Fix error handling in cifs_push_mandatory_locks
This commit is contained in:
Linus Torvalds 2012-09-11 05:52:49 +08:00
commit e9bd8f1624
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/cifs/file.c
View File

@ -917,7 +917,7 @@ cifs_push_mandatory_locks(struct cifsFileInfo *cfile)
if (!buf) {
mutex_unlock(&cinode->lock_mutex);
free_xid(xid);
return rc;
return -ENOMEM;
}
for (i = 0; i < 2; i++) {

4
fs/cifs/smb2pdu.h
View File

@ -96,7 +96,7 @@
*
*/
#define SMB2_HEADER_STRUCTURE_SIZE __constant_le16_to_cpu(64)
#define SMB2_HEADER_STRUCTURE_SIZE __constant_cpu_to_le16(64)
struct smb2_hdr {
__be32 smb2_buf_length; /* big endian on wire */
@ -140,7 +140,7 @@ struct smb2_pdu {
*
*/
#define SMB2_ERROR_STRUCTURE_SIZE2 __constant_le16_to_cpu(9)
#define SMB2_ERROR_STRUCTURE_SIZE2 __constant_cpu_to_le16(9)
struct smb2_err_rsp {
struct smb2_hdr hdr;