Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / fs / ext2 / inode.c

diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 4389ac9..a91a711 100644 (file)
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -136,7 +136,7 @@ static int ext2_alloc_block (struct inode * inode, unsigned long goal, int *err)
                                 &ei->i_prealloc_count,
                                 &ei->i_prealloc_block, err);
                else
-                       result = ext2_new_block (inode, goal, 0, 0, err);
+                       result = ext2_new_block(inode, goal, NULL, NULL, err);
        }
 #else
        result = ext2_new_block (inode, goal, 0, 0, err);
@@ -1319,11 +1319,8 @@ int ext2_setattr(struct dentry *dentry, struct iattr *iattr)
                if (error)
                        return error;
        }
-       if (iattr->ia_valid & ATTR_ATTR_FLAG)
-               ext2_setattr_flags(inode, iattr->ia_attr_flags);
-
-       inode_setattr(inode, iattr);
-       if (iattr->ia_valid & ATTR_MODE)
+       error = inode_setattr(inode, iattr);
+       if (!error && (iattr->ia_valid & ATTR_MODE))
                error = ext2_acl_chmod(inode);
        return error;
 }