diff --git a/[refs] b/[refs]
index 0d5816e73b26..73e90cd9b6f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c5e628f95b440b69332b1ed3eb112648fc8f7ff
+refs/heads/master: af4b3c355cbd38703471e55d11f42d8640db4118
diff --git a/trunk/fs/cifs/cifsacl.c b/trunk/fs/cifs/cifsacl.c
index 6fe1bc5bb368..34902cff5400 100644
--- a/trunk/fs/cifs/cifsacl.c
+++ b/trunk/fs/cifs/cifsacl.c
@@ -589,7 +589,7 @@ static struct cifs_ntsd *get_cifs_acl(u32 *pacllen, struct inode *inode,
 		unlock_file = true;
 		fid = open_file->netfid;
 	} else if (pfid == NULL) {
-		bool oplock = false;
+		int oplock = 0;
 		/* open file */
 		rc = CIFSSMBOpen(xid, cifs_sb->tcon, path, FILE_OPEN,
 				READ_CONTROL, 0, &fid, &oplock, NULL,