From 30c8c22af590bf6ad6ac0cfe305553d7ba894973 Mon Sep 17 00:00:00 2001
From: Steve French <sfrench@us.ibm.com>
Date: Tue, 29 Nov 2005 21:22:19 -0800
Subject: [PATCH] --- yaml --- r: 14818 b: refs/heads/master c:
 2a138ebb012ac42c082ae8b40c87c1f265664391 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/cifs/cifsfs.c | 2 +-
 trunk/fs/cifs/inode.c  | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 16b7910b6974..2431c8e4a5c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 606c0dafbe88102d64c1253caed8a2c36987070f
+refs/heads/master: 2a138ebb012ac42c082ae8b40c87c1f265664391
diff --git a/trunk/fs/cifs/cifsfs.c b/trunk/fs/cifs/cifsfs.c
index f4974b41e485..2a13a2bac8f1 100644
--- a/trunk/fs/cifs/cifsfs.c
+++ b/trunk/fs/cifs/cifsfs.c
@@ -921,7 +921,7 @@ static int cifs_dnotify_thread(void * dummyarg)
 			ses = list_entry(tmp, struct cifsSesInfo, 
 				cifsSessionList);
 			if(ses && ses->server && 
-			     atomic_read(&ses->server->inSend))
+			     atomic_read(&ses->server->inFlight))
 				wake_up_all(&ses->server->response_q);
 		}
 		read_unlock(&GlobalSMBSeslock);
diff --git a/trunk/fs/cifs/inode.c b/trunk/fs/cifs/inode.c
index 053c1cadf703..e8773461c7f7 100644
--- a/trunk/fs/cifs/inode.c
+++ b/trunk/fs/cifs/inode.c
@@ -778,6 +778,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode)
 						current->fsgid;
 				}
 			}
+		}
 	}
 	kfree(full_path);
 	FreeXid(xid);
@@ -1124,7 +1125,7 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs)
 	cifs_sb = CIFS_SB(direntry->d_inode->i_sb);
 	pTcon = cifs_sb->tcon;
 
-	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM == 0) {
+	if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM) == 0) {
 		/* check if we have permission to change attrs */
 		rc = inode_change_ok(direntry->d_inode, attrs);
 		if(rc < 0) {