From: Jeff Layton <jlayton@redhat.com>
Date: Tue, 7 Feb 2012 11:30:52 +0000 (-0500)
Subject: cifs: request oplock when doing open on lookup
X-Git-Tag: v3.2.7~12
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=77d04b76d64e24329bb63d3d8d52c942db61bcb6;p=unionfs-2.6.39.y.git

cifs: request oplock when doing open on lookup

commit 8b0192a5f478da1c1ae906bf3ffff53f26204f56 upstream.

Currently, it's always set to 0 (no oplock requested).

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index d7eeb9d3ed6..e4c33345113 100644
--- a/fs/cifs/dir.c
+++ b/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;