Merge Linus' tree.

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

diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 053c1cadf7031b805e752a26488c04166bcd6074..9558f51bca55a1bd1c12a0140075013ea02628b5 100644 (file)
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -770,6 +770,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode)
                                                 -1, -1, local_nls); */
                        if(direntry->d_inode) {
                                direntry->d_inode->i_mode = mode;
+                               direntry->d_inode->i_mode |= S_IFDIR;
                                if(cifs_sb->mnt_cifs_flags & 
                                     CIFS_MOUNT_SET_UID) {
                                        direntry->d_inode->i_uid = 
@@ -778,6 +779,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode)
                                                current->fsgid;
                                }
                        }
+               }
        }
        kfree(full_path);
        FreeXid(xid);
@@ -1124,7 +1126,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) {
@@ -1146,8 +1148,7 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs)
        /* BB check if we need to refresh inode from server now ? BB */
 
        /* need to flush data before changing file size on server */
-       filemap_fdatawrite(direntry->d_inode->i_mapping);
-       filemap_fdatawait(direntry->d_inode->i_mapping);
+       filemap_write_and_wait(direntry->d_inode->i_mapping);
 
        if (attrs->ia_valid & ATTR_SIZE) {
                /* To avoid spurious oplock breaks from server, in the case of