summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2012-02-07 06:30:52 -0500
committerSteve French <smfrench@gmail.com>2012-02-07 22:25:29 -0600
commit8b0192a5f478da1c1ae906bf3ffff53f26204f56 (patch)
treece60f059f2d1ad6d53bf1546de1869349daeddeb
parent4edc53c1f8cdd99d349165d6c61c45aa4e8e2564 (diff)
downloadblackbird-op-linux-8b0192a5f478da1c1ae906bf3ffff53f26204f56.tar.gz
blackbird-op-linux-8b0192a5f478da1c1ae906bf3ffff53f26204f56.zip
cifs: request oplock when doing open on lookup
Currently, it's always set to 0 (no oplock requested). Cc: <stable@vger.kernel.org> Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <smfrench@gmail.com>
-rw-r--r--fs/cifs/dir.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index df8fecb5b993..63a196b97d50 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;
OpenPOWER on IntegriCloud