aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-12 15:42:29 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-12 15:42:36 -0400
commitf1b2a5ace996de339292d4035f9f5b294aecd11e (patch)
tree3bd8144cf1b60e80d33295885b0fe572070e8b52
parent5e4c5f4c64902870552d4c15325d9e7d1a39884d (diff)
parent14835a3325c1f84c3ae6eaf81102a3917e84809e (diff)
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
-rw-r--r--fs/cifs/misc.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
index 654d972a88f..88786ba02d2 100644
--- a/fs/cifs/misc.c
+++ b/fs/cifs/misc.c
@@ -311,8 +311,6 @@ header_assemble(struct smb_hdr *buffer, char smb_command /* command */ ,
311 buffer->Flags2 = SMBFLG2_KNOWS_LONG_NAMES; 311 buffer->Flags2 = SMBFLG2_KNOWS_LONG_NAMES;
312 buffer->Pid = cpu_to_le16((__u16)current->tgid); 312 buffer->Pid = cpu_to_le16((__u16)current->tgid);
313 buffer->PidHigh = cpu_to_le16((__u16)(current->tgid >> 16)); 313 buffer->PidHigh = cpu_to_le16((__u16)(current->tgid >> 16));
314 spin_lock(&GlobalMid_Lock);
315 spin_unlock(&GlobalMid_Lock);
316 if (treeCon) { 314 if (treeCon) {
317 buffer->Tid = treeCon->tid; 315 buffer->Tid = treeCon->tid;
318 if (treeCon->ses) { 316 if (treeCon->ses) {