Merge branch 'linus' into x86/irq

[linux-2.6] / fs / cifs / cifsacl.c

diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
index 6fe1bc5bb368438dfbd1edc8a7a3ecd0d5f2b6b9..34902cff540059988efa9e014b76cc63a8b10d15 100644 (file)
--- a/fs/cifs/cifsacl.c
+++ b/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,