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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  [CIFS] cifs: remove pointless lock and unlock of GlobalMid_Lock in header_assemble
parents 5e4c5f4c 14835a33

fs/cifs/misc.c

+0 −2
Original line number Diff line number Diff line
@@ -311,8 +311,6 @@ header_assemble(struct smb_hdr *buffer, char smb_command /* command */ , 
	buffer->Flags2 = SMBFLG2_KNOWS_LONG_NAMES;

	buffer->Pid = cpu_to_le16((__u16)current->tgid);

	buffer->PidHigh = cpu_to_le16((__u16)(current->tgid >> 16));

	spin_lock(&GlobalMid_Lock);

	spin_unlock(&GlobalMid_Lock);

	if (treeCon) {

		buffer->Tid = treeCon->tid;

		if (treeCon->ses) {