---

yaml --- r: 287605 b: refs/heads/master c: 8b0192a h: refs/heads/master i: 287603: 8f780ab v: v3
git-mirror · Feb 8, 2012 · d07b9b6 · d07b9b6
1 parent a5fb6f2
commit d07b9b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;