drm/radeon: fix page flipping hangs on r300/r400

[mv-sheeva.git] / fs / ext2 / ialloc.c

diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c
index 938dbc739d00e9c1e7695e25b76f24c34727738b..ad70479aabff30d08d1b322846e7e3f49ecbe3d5 100644 (file)
--- a/fs/ext2/ialloc.c
+++ b/fs/ext2/ialloc.c
@@ -118,19 +118,14 @@ void ext2_free_inode (struct inode * inode)
         * Note: we must free any quota before locking the superblock,
         * as writing the quota to disk may need the lock as well.
         */
-       if (!is_bad_inode(inode)) {
-               /* Quota is already initialized in iput() */
-               ext2_xattr_delete_inode(inode);
-               dquot_free_inode(inode);
-               dquot_drop(inode);
-       }
+       /* Quota is already initialized in iput() */
+       ext2_xattr_delete_inode(inode);
+       dquot_free_inode(inode);
+       dquot_drop(inode);
 
        es = EXT2_SB(sb)->s_es;
        is_directory = S_ISDIR(inode->i_mode);
 
-       /* Do this BEFORE marking the inode not in use or returning an error */
-       clear_inode (inode);
-
        if (ino < EXT2_FIRST_INO(sb) ||
            ino > le32_to_cpu(es->s_inodes_count)) {
                ext2_error (sb, "ext2_free_inode",