Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5faa0154 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:
 "A set of three minor cifs fixes"

* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: make new inode cache when file type is different
  Fix signed/unsigned pointer warning
  Convert MessageID in smb2_hdr to LE
parents b9d4a35f 9e6d722f

fs/cifs/cifsglob.h

+3 −3
Original line number Diff line number Diff line
@@ -661,16 +661,16 @@ set_credits(struct TCP_Server_Info *server, const int val) 
	server->ops->set_credits(server, val);

}



static inline __u64

static inline __le64

get_next_mid64(struct TCP_Server_Info *server)

{

	return server->ops->get_next_mid(server);

	return cpu_to_le64(server->ops->get_next_mid(server));

}



static inline __le16

get_next_mid(struct TCP_Server_Info *server)

{

	__u16 mid = get_next_mid64(server);

	__u16 mid = server->ops->get_next_mid(server);

	/*

	 * The value in the SMB header should be little endian for easy

	 * on-the-wire decoding.

fs/cifs/netmisc.c

+7 −5
Original line number Diff line number Diff line
@@ -926,6 +926,7 @@ cifs_NTtimeToUnix(__le64 ntutc) 


	/* Subtract the NTFS time offset, then convert to 1s intervals. */

	s64 t = le64_to_cpu(ntutc) - NTFS_TIME_OFFSET;

	u64 abs_t;



	/*

	 * Unfortunately can not use normal 64 bit division on 32 bit arch, but
@@ -933,13 +934,14 @@ cifs_NTtimeToUnix(__le64 ntutc) 
	 * to special case them

	 */

	if (t < 0) {

		t = -t;

		ts.tv_nsec = (long)(do_div(t, 10000000) * 100);

		abs_t = -t;

		ts.tv_nsec = (long)(do_div(abs_t, 10000000) * 100);

		ts.tv_nsec = -ts.tv_nsec;

		ts.tv_sec = -t;

		ts.tv_sec = -abs_t;

	} else {

		ts.tv_nsec = (long)do_div(t, 10000000) * 100;

		ts.tv_sec = t;

		abs_t = t;

		ts.tv_nsec = (long)do_div(abs_t, 10000000) * 100;

		ts.tv_sec = abs_t;

	}



	return ts;

fs/cifs/readdir.c

+7 −3
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ static inline void dump_cifs_file_struct(struct file *file, char *label) 
 * Attempt to preload the dcache with the results from the FIND_FIRST/NEXT

 *

 * Find the dentry that matches "name". If there isn't one, create one. If it's

 * a negative dentry or the uniqueid changed, then drop it and recreate it.

 * a negative dentry or the uniqueid or filetype(mode) changed,

 * then drop it and recreate it.

 */

static void

cifs_prime_dcache(struct dentry *parent, struct qstr *name,
@@ -97,8 +98,11 @@ cifs_prime_dcache(struct dentry *parent, struct qstr *name, 
			if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM))

				fattr->cf_uniqueid = CIFS_I(inode)->uniqueid;



			/* update inode in place if i_ino didn't change */

			if (CIFS_I(inode)->uniqueid == fattr->cf_uniqueid) {

			/* update inode in place

			 * if both i_ino and i_mode didn't change */

			if (CIFS_I(inode)->uniqueid == fattr->cf_uniqueid &&

			    (inode->i_mode & S_IFMT) ==

			    (fattr->cf_mode & S_IFMT)) {

				cifs_fattr_to_inode(inode, fattr);

				goto out;

			}

fs/cifs/smb2misc.c

+7 −5
Original line number Diff line number Diff line
@@ -32,12 +32,14 @@ 
static int

check_smb2_hdr(struct smb2_hdr *hdr, __u64 mid)

{

	__u64 wire_mid = le64_to_cpu(hdr->MessageId);



	/*

	 * Make sure that this really is an SMB, that it is a response,

	 * and that the message ids match.

	 */

	if ((*(__le32 *)hdr->ProtocolId == SMB2_PROTO_NUMBER) &&

	    (mid == hdr->MessageId)) {

	    (mid == wire_mid)) {

		if (hdr->Flags & SMB2_FLAGS_SERVER_TO_REDIR)

			return 0;

		else {
@@ -51,11 +53,11 @@ check_smb2_hdr(struct smb2_hdr *hdr, __u64 mid) 
		if (*(__le32 *)hdr->ProtocolId != SMB2_PROTO_NUMBER)

			cifs_dbg(VFS, "Bad protocol string signature header %x\n",

				 *(unsigned int *) hdr->ProtocolId);

		if (mid != hdr->MessageId)

		if (mid != wire_mid)

			cifs_dbg(VFS, "Mids do not match: %llu and %llu\n",

				 mid, hdr->MessageId);

				 mid, wire_mid);

	}

	cifs_dbg(VFS, "Bad SMB detected. The Mid=%llu\n", hdr->MessageId);

	cifs_dbg(VFS, "Bad SMB detected. The Mid=%llu\n", wire_mid);

	return 1;

}
@@ -95,7 +97,7 @@ smb2_check_message(char *buf, unsigned int length) 
{

	struct smb2_hdr *hdr = (struct smb2_hdr *)buf;

	struct smb2_pdu *pdu = (struct smb2_pdu *)hdr;

	__u64 mid = hdr->MessageId;

	__u64 mid = le64_to_cpu(hdr->MessageId);

	__u32 len = get_rfc1002_length(buf);

	__u32 clc_len;  /* calculated length */

	int command;

fs/cifs/smb2ops.c

+2 −1
Original line number Diff line number Diff line
@@ -176,10 +176,11 @@ smb2_find_mid(struct TCP_Server_Info *server, char *buf) 
{

	struct mid_q_entry *mid;

	struct smb2_hdr *hdr = (struct smb2_hdr *)buf;

	__u64 wire_mid = le64_to_cpu(hdr->MessageId);



	spin_lock(&GlobalMid_Lock);

	list_for_each_entry(mid, &server->pending_mid_q, qhead) {

		if ((mid->mid == hdr->MessageId) &&

		if ((mid->mid == wire_mid) &&

		    (mid->mid_state == MID_REQUEST_SUBMITTED) &&

		    (mid->command == hdr->Command)) {

			spin_unlock(&GlobalMid_Lock);