diff options
-rw-r--r-- | fs/cifs/cifsfs.c | 2 | ||||
-rw-r--r-- | fs/cifs/inode.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index f4974b41e485..2a13a2bac8f1 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
@@ -921,7 +921,7 @@ static int cifs_dnotify_thread(void * dummyarg) | |||
921 | ses = list_entry(tmp, struct cifsSesInfo, | 921 | ses = list_entry(tmp, struct cifsSesInfo, |
922 | cifsSessionList); | 922 | cifsSessionList); |
923 | if(ses && ses->server && | 923 | if(ses && ses->server && |
924 | atomic_read(&ses->server->inSend)) | 924 | atomic_read(&ses->server->inFlight)) |
925 | wake_up_all(&ses->server->response_q); | 925 | wake_up_all(&ses->server->response_q); |
926 | } | 926 | } |
927 | read_unlock(&GlobalSMBSeslock); | 927 | read_unlock(&GlobalSMBSeslock); |
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 053c1cadf703..e8773461c7f7 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c | |||
@@ -778,6 +778,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode) | |||
778 | current->fsgid; | 778 | current->fsgid; |
779 | } | 779 | } |
780 | } | 780 | } |
781 | } | ||
781 | } | 782 | } |
782 | kfree(full_path); | 783 | kfree(full_path); |
783 | FreeXid(xid); | 784 | FreeXid(xid); |
@@ -1124,7 +1125,7 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs) | |||
1124 | cifs_sb = CIFS_SB(direntry->d_inode->i_sb); | 1125 | cifs_sb = CIFS_SB(direntry->d_inode->i_sb); |
1125 | pTcon = cifs_sb->tcon; | 1126 | pTcon = cifs_sb->tcon; |
1126 | 1127 | ||
1127 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM == 0) { | 1128 | if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM) == 0) { |
1128 | /* check if we have permission to change attrs */ | 1129 | /* check if we have permission to change attrs */ |
1129 | rc = inode_change_ok(direntry->d_inode, attrs); | 1130 | rc = inode_change_ok(direntry->d_inode, attrs); |
1130 | if(rc < 0) { | 1131 | if(rc < 0) { |