From d07b9b6c06f1bd66af844d0d9892c540c693902e Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Tue, 7 Feb 2012 06:30:52 -0500
Subject: [PATCH] --- yaml --- r: 287605 b: refs/heads/master c:
 8b0192a5f478da1c1ae906bf3ffff53f26204f56 h: refs/heads/master i:   287603:
 8f780ab4604c2211faada71594e10fb92eb4282c v: v3

---
 [refs]              | 2 +-
 trunk/fs/cifs/dir.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ff065260ada6..8d34b926b519 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4edc53c1f8cdd99d349165d6c61c45aa4e8e2564
+refs/heads/master: 8b0192a5f478da1c1ae906bf3ffff53f26204f56
diff --git a/trunk/fs/cifs/dir.c b/trunk/fs/cifs/dir.c
index df8fecb5b993..63a196b97d50 100644
--- a/trunk/fs/cifs/dir.c
+++ b/trunk/fs/cifs/dir.c
@@ -492,7 +492,7 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry,
 {
 	int xid;
 	int rc = 0; /* to get around spurious gcc warning, set to zero here */
-	__u32 oplock = 0;
+	__u32 oplock = enable_oplocks ? REQ_OPLOCK : 0;
 	__u16 fileHandle = 0;
 	bool posix_open = false;
 	struct cifs_sb_info *cifs_sb;