Commit e9bd8f16 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 1b0a9069 b2ede58e

fs/cifs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -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++) {

fs/cifs/smb2pdu.h

+2 −2
Original line number Diff line number Diff line
@@ -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;