---

yaml --- r: 96316 b: refs/heads/master c: af4b3c3 h: refs/heads/master v: v3
git-mirror · May 9, 2008 · f54aab7 · f54aab7
1 parent 5e751ea
commit f54aab7
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: 7c5e628f95b440b69332b1ed3eb112648fc8f7ff
+refs/heads/master: af4b3c355cbd38703471e55d11f42d8640db4118
diff --git 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,