diff --git a/[refs] b/[refs]
index 0e17c50e68c3..2befff9c1c3c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad009ac96509e005d9978d0ae9e9ec4d63ad2990
+refs/heads/master: cbe0476fa6a76b01b79e7c117963d45ed0a28758
diff --git a/trunk/fs/cifs/CHANGES b/trunk/fs/cifs/CHANGES
index 43b3119a16ed..ce16b0ae772e 100644
--- a/trunk/fs/cifs/CHANGES
+++ b/trunk/fs/cifs/CHANGES
@@ -6,7 +6,8 @@ Add support for lsattr (getting ext2/ext3/reiserfs attr flags from the server)
 as new protocol extensions. Do not send Get/Set calls for POSIX ACLs
 unless server explicitly claims to support them in CIFS Unix extensions
 POSIX ACL capability bit. Fix packet signing when multiuser mounting with
-different users from the same client to the same server.
+different users from the same client to the same server. Fix oops in
+cifs_close.
 
 Version 1.31
 ------------
diff --git a/trunk/fs/cifs/file.c b/trunk/fs/cifs/file.c
index dcab7cf1b53b..9c7755053099 100644
--- a/trunk/fs/cifs/file.c
+++ b/trunk/fs/cifs/file.c
@@ -465,8 +465,10 @@ int cifs_close(struct inode *inode, struct file *file)
 				write_lock(&file->f_owner.lock);
 			}
 		}
+		write_lock(&GlobalSMBSeslock);
 		list_del(&pSMBFile->flist);
 		list_del(&pSMBFile->tlist);
+		write_unlock(&GlobalSMBSeslock);
 		write_unlock(&file->f_owner.lock);
 		kfree(pSMBFile->search_resume_name);
 		kfree(file->private_data);