This commit was manufactured by cvs2svn to create branch 'vserver'.
[linux-2.6.git] / fs / ext3 / inode.c
index 0f0a7f3..5582996 100644 (file)
@@ -129,7 +129,7 @@ static unsigned long blocks_for_truncate(struct inode *inode)
        if (needed > EXT3_MAX_TRANS_DATA) 
                needed = EXT3_MAX_TRANS_DATA;
 
-       return EXT3_DATA_TRANS_BLOCKS + needed;
+       return EXT3_DATA_TRANS_BLOCKS(inode->i_sb) + needed;
 }
 
 /* 
@@ -181,8 +181,6 @@ static int ext3_journal_test_restart(handle_t *handle, struct inode *inode)
        return ext3_journal_restart(handle, blocks_for_truncate(inode));
 }
 
-static void ext3_truncate_nocheck (struct inode *inode);
-
 /*
  * Called at the last iput() if i_nlink is zero.
  */
@@ -190,6 +188,8 @@ void ext3_delete_inode (struct inode * inode)
 {
        handle_t *handle;
 
+       truncate_inode_pages(&inode->i_data, 0);
+
        if (is_bad_inode(inode))
                goto no_delete;
 
@@ -206,7 +206,7 @@ void ext3_delete_inode (struct inode * inode)
                handle->h_sync = 1;
        inode->i_size = 0;
        if (inode->i_blocks)
-               ext3_truncate_nocheck(inode);
+               ext3_truncate(inode);
        /*
         * Kill off the orphan record which ext3_truncate created.
         * AKPM: I think this can be inside the above `if'.
@@ -458,34 +458,24 @@ static unsigned long ext3_find_near(struct inode *inode, Indirect *ind)
  *     @goal:  place to store the result.
  *
  *     Normally this function find the prefered place for block allocation,
- *     stores it in *@goal and returns zero. If the branch had been changed
- *     under us we return -EAGAIN.
+ *     stores it in *@goal and returns zero.
  */
 
-static int ext3_find_goal(struct inode *inode, long block, Indirect chain[4],
-                         Indirect *partial, unsigned long *goal)
+static unsigned long ext3_find_goal(struct inode *inode, long block,
+               Indirect chain[4], Indirect *partial)
 {
-       struct ext3_inode_info *ei = EXT3_I(inode);
-       /* Writer: ->i_next_alloc* */
-       if ((block == ei->i_next_alloc_block + 1)&& ei->i_next_alloc_goal) {
-               ei->i_next_alloc_block++;
-               ei->i_next_alloc_goal++;
-       }
-       /* Writer: end */
-       /* Reader: pointers, ->i_next_alloc* */
-       if (verify_chain(chain, partial)) {
-               /*
-                * try the heuristic for sequential allocation,
-                * failing that at least try to get decent locality.
-                */
-               if (block == ei->i_next_alloc_block)
-                       *goal = ei->i_next_alloc_goal;
-               if (!*goal)
-                       *goal = ext3_find_near(inode, partial);
-               return 0;
+       struct ext3_block_alloc_info *block_i =  EXT3_I(inode)->i_block_alloc_info;
+
+       /*
+        * try the heuristic for sequential allocation,
+        * failing that at least try to get decent locality.
+        */
+       if (block_i && (block == block_i->last_alloc_logical_block + 1)
+               && (block_i->last_alloc_physical_block != 0)) {
+               return block_i->last_alloc_physical_block + 1;
        }
-       /* Reader: end */
-       return -EAGAIN;
+
+       return ext3_find_near(inode, partial);
 }
 
 /**
@@ -502,7 +492,7 @@ static int ext3_find_goal(struct inode *inode, long block, Indirect chain[4],
  *     the same format as ext3_get_branch() would do. We are calling it after
  *     we had read the existing part of chain and partial points to the last
  *     triple of that (one with zero ->key). Upon the exit we have the same
- *     picture as after the successful ext3_get_block(), excpet that in one
+ *     picture as after the successful ext3_get_block(), except that in one
  *     place chain is disconnected - *branch->p is still zero (we did not
  *     set the last link), but branch->key contains the number that should
  *     be placed into *branch->p to fill that gap.
@@ -534,7 +524,6 @@ static int ext3_alloc_branch(handle_t *handle, struct inode *inode,
                        if (!nr)
                                break;
                        branch[n].key = cpu_to_le32(nr);
-                       keys = n+1;
 
                        /*
                         * Get buffer_head for parent block, zero it out
@@ -542,6 +531,9 @@ static int ext3_alloc_branch(handle_t *handle, struct inode *inode,
                         * parent to disk.  
                         */
                        bh = sb_getblk(inode->i_sb, parent);
+                       if (!bh)
+                               break;
+                       keys = n+1;
                        branch[n].bh = bh;
                        lock_buffer(bh);
                        BUFFER_TRACE(bh, "call get_create_access");
@@ -589,12 +581,9 @@ static int ext3_alloc_branch(handle_t *handle, struct inode *inode,
  *     @where: location of missing link
  *     @num:   number of blocks we are adding
  *
- *     This function verifies that chain (up to the missing link) had not
- *     changed, fills the missing link and does all housekeeping needed in
+ *     This function fills the missing link and does all housekeeping needed in
  *     inode (->i_blocks, etc.). In case of success we end up with the full
- *     chain to new block and return 0. Otherwise (== chain had been changed)
- *     we free the new blocks (forgetting their buffer_heads, indeed) and
- *     return -EAGAIN.
+ *     chain to new block and return 0.
  */
 
 static int ext3_splice_branch(handle_t *handle, struct inode *inode, long block,
@@ -602,7 +591,7 @@ static int ext3_splice_branch(handle_t *handle, struct inode *inode, long block,
 {
        int i;
        int err = 0;
-       struct ext3_inode_info *ei = EXT3_I(inode);
+       struct ext3_block_alloc_info *block_i = EXT3_I(inode)->i_block_alloc_info;
 
        /*
         * If we're splicing into a [td]indirect block (as opposed to the
@@ -615,19 +604,19 @@ static int ext3_splice_branch(handle_t *handle, struct inode *inode, long block,
                if (err)
                        goto err_out;
        }
-       /* Verify that place we are splicing to is still there and vacant */
-
-       /* Writer: pointers, ->i_next_alloc* */
-       if (!verify_chain(chain, where-1) || *where->p)
-               /* Writer: end */
-               goto changed;
-
        /* That's it */
 
        *where->p = where->key;
-       ei->i_next_alloc_block = block;
-       ei->i_next_alloc_goal = le32_to_cpu(where[num-1].key);
-       /* Writer: end */
+
+       /*
+        * update the most recently allocated logical & physical block
+        * in i_block_alloc_info, to assist find the proper goal block for next
+        * allocation
+        */
+       if (block_i) {
+               block_i->last_alloc_logical_block = block;
+               block_i->last_alloc_physical_block = le32_to_cpu(where[num-1].key);
+       }
 
        /* We are done with atomic stuff, now do the rest of housekeeping */
 
@@ -658,26 +647,11 @@ static int ext3_splice_branch(handle_t *handle, struct inode *inode, long block,
        }
        return err;
 
-changed:
-       /*
-        * AKPM: if where[i].bh isn't part of the current updating
-        * transaction then we explode nastily.  Test this code path.
-        */
-       jbd_debug(1, "the chain changed: try again\n");
-       err = -EAGAIN;
-
 err_out:
        for (i = 1; i < num; i++) {
                BUFFER_TRACE(where[i].bh, "call journal_forget");
                ext3_journal_forget(handle, where[i].bh);
        }
-       /* For the normal collision cleanup case, we free up the blocks.
-        * On genuine filesystem errors we don't even think about doing
-        * that. */
-       if (err == -EAGAIN)
-               for (i = 0; i < num; i++)
-                       ext3_free_blocks(handle, inode, 
-                                        le32_to_cpu(where[i].key), 1);
        return err;
 }
 
@@ -709,7 +683,7 @@ ext3_get_block_handle(handle_t *handle, struct inode *inode, sector_t iblock,
        unsigned long goal;
        int left;
        int boundary = 0;
-       int depth = ext3_block_to_path(inode, iblock, offsets, &boundary);
+       const int depth = ext3_block_to_path(inode, iblock, offsets, &boundary);
        struct ext3_inode_info *ei = EXT3_I(inode);
 
        J_ASSERT(handle != NULL || create == 0);
@@ -717,48 +691,55 @@ ext3_get_block_handle(handle_t *handle, struct inode *inode, sector_t iblock,
        if (depth == 0)
                goto out;
 
-reread:
        partial = ext3_get_branch(inode, depth, offsets, chain, &err);
 
        /* Simplest case - block found, no allocation needed */
        if (!partial) {
                clear_buffer_new(bh_result);
-got_it:
-               map_bh(bh_result, inode->i_sb, le32_to_cpu(chain[depth-1].key));
-               if (boundary)
-                       set_buffer_boundary(bh_result);
-               /* Clean up and exit */
-               partial = chain+depth-1; /* the whole chain */
-               goto cleanup;
+               goto got_it;
        }
 
        /* Next simple case - plain lookup or failed read of indirect block */
-       if (!create || err == -EIO) {
-cleanup:
+       if (!create || err == -EIO)
+               goto cleanup;
+
+       down(&ei->truncate_sem);
+
+       /*
+        * If the indirect block is missing while we are reading
+        * the chain(ext3_get_branch() returns -EAGAIN err), or
+        * if the chain has been changed after we grab the semaphore,
+        * (either because another process truncated this branch, or
+        * another get_block allocated this branch) re-grab the chain to see if
+        * the request block has been allocated or not.
+        *
+        * Since we already block the truncate/other get_block
+        * at this point, we will have the current copy of the chain when we
+        * splice the branch into the tree.
+        */
+       if (err == -EAGAIN || !verify_chain(chain, partial)) {
                while (partial > chain) {
-                       BUFFER_TRACE(partial->bh, "call brelse");
                        brelse(partial->bh);
                        partial--;
                }
-               BUFFER_TRACE(bh_result, "returned");
-out:
-               return err;
+               partial = ext3_get_branch(inode, depth, offsets, chain, &err);
+               if (!partial) {
+                       up(&ei->truncate_sem);
+                       if (err)
+                               goto cleanup;
+                       clear_buffer_new(bh_result);
+                       goto got_it;
+               }
        }
 
        /*
-        * Indirect block might be removed by truncate while we were
-        * reading it. Handling of that case (forget what we've got and
-        * reread) is taken out of the main path.
-        */
-       if (err == -EAGAIN)
-               goto changed;
+        * Okay, we need to do block allocation.  Lazily initialize the block
+        * allocation info here if necessary
+       */
+       if (S_ISREG(inode->i_mode) && (!ei->i_block_alloc_info))
+               ext3_init_block_alloc_info(inode);
 
-       goal = 0;
-       down(&ei->truncate_sem);
-       if (ext3_find_goal(inode, iblock, chain, partial, &goal) < 0) {
-               up(&ei->truncate_sem);
-               goto changed;
-       }
+       goal = ext3_find_goal(inode, iblock, chain, partial);
 
        left = (chain + depth) - partial;
 
@@ -766,38 +747,45 @@ out:
         * Block out ext3_truncate while we alter the tree
         */
        err = ext3_alloc_branch(handle, inode, left, goal,
-                                       offsets+(partial-chain), partial);
+                               offsets + (partial - chain), partial);
 
-       /* The ext3_splice_branch call will free and forget any buffers
+       /*
+        * The ext3_splice_branch call will free and forget any buffers
         * on the new chain if there is a failure, but that risks using
         * up transaction credits, especially for bitmaps where the
         * credits cannot be returned.  Can we handle this somehow?  We
-        * may need to return -EAGAIN upwards in the worst case.  --sct */
+        * may need to return -EAGAIN upwards in the worst case.  --sct
+        */
        if (!err)
                err = ext3_splice_branch(handle, inode, iblock, chain,
                                         partial, left);
-       /* i_disksize growing is protected by truncate_sem
-        * don't forget to protect it if you're about to implement
-        * concurrent ext3_get_block() -bzzz */
+       /*
+        * i_disksize growing is protected by truncate_sem.  Don't forget to
+        * protect it if you're about to implement concurrent
+        * ext3_get_block() -bzzz
+       */
        if (!err && extend_disksize && inode->i_size > ei->i_disksize)
                ei->i_disksize = inode->i_size;
        up(&ei->truncate_sem);
-       if (err == -EAGAIN)
-               goto changed;
        if (err)
                goto cleanup;
 
        set_buffer_new(bh_result);
-       goto got_it;
-
-changed:
+got_it:
+       map_bh(bh_result, inode->i_sb, le32_to_cpu(chain[depth-1].key));
+       if (boundary)
+               set_buffer_boundary(bh_result);
+       /* Clean up and exit */
+       partial = chain + depth - 1;    /* the whole chain */
+cleanup:
        while (partial > chain) {
-               jbd_debug(1, "buffer chain changed, retrying\n");
-               BUFFER_TRACE(partial->bh, "brelsing");
+               BUFFER_TRACE(partial->bh, "call brelse");
                brelse(partial->bh);
                partial--;
        }
-       goto reread;
+       BUFFER_TRACE(bh_result, "returned");
+out:
+       return err;
 }
 
 static int ext3_get_block(struct inode *inode, sector_t iblock,
@@ -879,6 +867,10 @@ struct buffer_head *ext3_getblk(handle_t *handle, struct inode * inode,
        if (!*errp && buffer_mapped(&dummy)) {
                struct buffer_head *bh;
                bh = sb_getblk(inode->i_sb, dummy.b_blocknr);
+               if (!bh) {
+                       *errp = -EIO;
+                       goto err;
+               }
                if (buffer_new(&dummy)) {
                        J_ASSERT(create != 0);
                        J_ASSERT(handle != 0);
@@ -911,6 +903,7 @@ struct buffer_head *ext3_getblk(handle_t *handle, struct inode * inode,
                }
                return bh;
        }
+err:
        return NULL;
 }
 
@@ -1013,7 +1006,10 @@ retry:
                ret = PTR_ERR(handle);
                goto out;
        }
-       ret = block_prepare_write(page, from, to, ext3_get_block);
+       if (test_opt(inode->i_sb, NOBH) && ext3_should_writeback_data(inode))
+               ret = nobh_prepare_write(page, from, to, ext3_get_block);
+       else
+               ret = block_prepare_write(page, from, to, ext3_get_block);
        if (ret)
                goto prepare_write_failed;
 
@@ -1097,7 +1093,12 @@ static int ext3_writeback_commit_write(struct file *file, struct page *page,
        new_i_size = ((loff_t)page->index << PAGE_CACHE_SHIFT) + to;
        if (new_i_size > EXT3_I(inode)->i_disksize)
                EXT3_I(inode)->i_disksize = new_i_size;
-       ret = generic_commit_write(file, page, from, to);
+
+       if (test_opt(inode->i_sb, NOBH) && ext3_should_writeback_data(inode))
+               ret = nobh_commit_write(file, page, from, to);
+       else
+               ret = generic_commit_write(file, page, from, to);
+
        ret2 = ext3_journal_stop(handle);
        if (!ret)
                ret = ret2;
@@ -1343,7 +1344,11 @@ static int ext3_writeback_writepage(struct page *page,
                goto out_fail;
        }
 
-       ret = block_write_full_page(page, ext3_get_block, wbc);
+       if (test_opt(inode->i_sb, NOBH) && ext3_should_writeback_data(inode))
+               ret = nobh_writepage(page, ext3_get_block, wbc);
+       else
+               ret = block_write_full_page(page, ext3_get_block, wbc);
+
        err = ext3_journal_stop(handle);
        if (!ret)
                ret = err;
@@ -1380,8 +1385,10 @@ static int ext3_journalled_writepage(struct page *page,
                ClearPageChecked(page);
                ret = block_prepare_write(page, 0, PAGE_CACHE_SIZE,
                                        ext3_get_block);
-               if (ret != 0)
+               if (ret != 0) {
+                       ext3_journal_stop(handle);
                        goto out_unlock;
+               }
                ret = walk_page_buffers(handle, page_buffers(page), 0,
                        PAGE_CACHE_SIZE, NULL, do_journal_get_write_access);
 
@@ -1437,11 +1444,13 @@ static int ext3_invalidatepage(struct page *page, unsigned long offset)
        return journal_invalidatepage(journal, page, offset);
 }
 
-static int ext3_releasepage(struct page *page, int wait)
+static int ext3_releasepage(struct page *page, gfp_t wait)
 {
        journal_t *journal = EXT3_JOURNAL(page->mapping->host);
 
        WARN_ON(PageChecked(page));
+       if (!page_has_buffers(page))
+               return 0;
        return journal_try_to_free_buffers(journal, page, wait);
 }
 
@@ -1551,6 +1560,7 @@ static struct address_space_operations ext3_ordered_aops = {
        .invalidatepage = ext3_invalidatepage,
        .releasepage    = ext3_releasepage,
        .direct_IO      = ext3_direct_IO,
+       .migratepage    = buffer_migrate_page,
 };
 
 static struct address_space_operations ext3_writeback_aops = {
@@ -1564,6 +1574,7 @@ static struct address_space_operations ext3_writeback_aops = {
        .invalidatepage = ext3_invalidatepage,
        .releasepage    = ext3_releasepage,
        .direct_IO      = ext3_direct_IO,
+       .migratepage    = buffer_migrate_page,
 };
 
 static struct address_space_operations ext3_journalled_aops = {
@@ -1603,13 +1614,27 @@ static int ext3_block_truncate_page(handle_t *handle, struct page *page,
        unsigned blocksize, iblock, length, pos;
        struct inode *inode = mapping->host;
        struct buffer_head *bh;
-       int err;
+       int err = 0;
        void *kaddr;
 
        blocksize = inode->i_sb->s_blocksize;
        length = blocksize - (offset & (blocksize - 1));
        iblock = index << (PAGE_CACHE_SHIFT - inode->i_sb->s_blocksize_bits);
 
+       /*
+        * For "nobh" option,  we can only work if we don't need to
+        * read-in the page - otherwise we create buffers to do the IO.
+        */
+       if (!page_has_buffers(page) && test_opt(inode->i_sb, NOBH) &&
+            ext3_should_writeback_data(inode) && PageUptodate(page)) {
+               kaddr = kmap_atomic(page, KM_USER0);
+               memset(kaddr + offset, 0, length);
+               flush_dcache_page(page);
+               kunmap_atomic(kaddr, KM_USER0);
+               set_page_dirty(page);
+               goto unlock;
+       }
+
        if (!page_has_buffers(page))
                create_empty_buffers(page, blocksize, 0);
 
@@ -2053,7 +2078,7 @@ static void ext3_free_branches(handle_t *handle, struct inode *inode,
  * ext3_truncate() run will find them and release them.
  */
 
-void ext3_truncate_nocheck(struct inode * inode)
+void ext3_truncate(struct inode * inode)
 {
        handle_t *handle;
        struct ext3_inode_info *ei = EXT3_I(inode);
@@ -2074,8 +2099,8 @@ void ext3_truncate_nocheck(struct inode * inode)
                return;
        if (ext3_inode_is_fast_symlink(inode))
                return;
-
-       ext3_discard_reservation(inode);
+       if (IS_APPEND(inode) || IS_IXORUNLINK(inode))
+               return;
 
        /*
         * We have to lock the EOF page here, because lock_page() nests
@@ -2201,6 +2226,9 @@ do_indirects:
                case EXT3_TIND_BLOCK:
                        ;
        }
+
+       ext3_discard_reservation(inode);
+
        up(&ei->truncate_sem);
        inode->i_mtime = inode->i_ctime = CURRENT_TIME_SEC;
        ext3_mark_inode_dirty(handle, inode);
@@ -2232,16 +2260,15 @@ static unsigned long ext3_get_inode_block(struct super_block *sb,
        struct ext3_group_desc * gdp;
 
 
-       if ((ino != EXT3_ROOT_INO &&
-               ino != EXT3_JOURNAL_INO &&
-               ino != EXT3_RESIZE_INO &&
-               ino < EXT3_FIRST_INO(sb)) ||
-               ino > le32_to_cpu(
-                       EXT3_SB(sb)->s_es->s_inodes_count)) {
-               ext3_error (sb, "ext3_get_inode_block",
-                           "bad inode number: %lu", ino);
+       if (!ext3_valid_inum(sb, ino)) {
+               /*
+                * This error is already checked for in namei.c unless we are
+                * looking at an NFS filehandle, in which case no error
+                * report is needed
+                */
                return 0;
        }
+
        block_group = (ino - 1) / EXT3_INODES_PER_GROUP(sb);
        if (block_group >= EXT3_SB(sb)->s_groups_count) {
                ext3_error (sb, "ext3_get_inode_block",
@@ -2391,34 +2418,81 @@ int ext3_get_inode_loc(struct inode *inode, struct ext3_iloc *iloc)
                !(EXT3_I(inode)->i_state & EXT3_STATE_XATTR));
 }
 
-void ext3_truncate(struct inode * inode)
-{
-       if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
-               return;
-       ext3_truncate_nocheck(inode);
-}
-
 void ext3_set_inode_flags(struct inode *inode)
 {
        unsigned int flags = EXT3_I(inode)->i_flags;
 
-       inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_IUNLINK|S_BARRIER|S_NOATIME|S_DIRSYNC);
-       if (flags & EXT3_SYNC_FL)
-               inode->i_flags |= S_SYNC;
-       if (flags & EXT3_APPEND_FL)
-               inode->i_flags |= S_APPEND;
+       inode->i_flags &= ~(S_IMMUTABLE | S_IUNLINK | S_BARRIER |
+               S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
+
        if (flags & EXT3_IMMUTABLE_FL)
                inode->i_flags |= S_IMMUTABLE;
        if (flags & EXT3_IUNLINK_FL)
                inode->i_flags |= S_IUNLINK;
        if (flags & EXT3_BARRIER_FL)
                inode->i_flags |= S_BARRIER;
+
+       if (flags & EXT3_SYNC_FL)
+               inode->i_flags |= S_SYNC;
+       if (flags & EXT3_APPEND_FL)
+               inode->i_flags |= S_APPEND;
        if (flags & EXT3_NOATIME_FL)
                inode->i_flags |= S_NOATIME;
        if (flags & EXT3_DIRSYNC_FL)
                inode->i_flags |= S_DIRSYNC;
 }
 
+int ext3_sync_flags(struct inode *inode)
+{
+       unsigned int oldflags, newflags;
+       int err = 0;
+
+       oldflags = EXT3_I(inode)->i_flags;
+       newflags = oldflags & ~(EXT3_APPEND_FL |
+               EXT3_IMMUTABLE_FL | EXT3_IUNLINK_FL |
+               EXT3_BARRIER_FL | EXT3_NOATIME_FL |
+               EXT3_SYNC_FL | EXT3_DIRSYNC_FL);
+
+       if (IS_APPEND(inode))
+               newflags |= EXT3_APPEND_FL;
+       if (IS_IMMUTABLE(inode))
+               newflags |= EXT3_IMMUTABLE_FL;
+       if (IS_IUNLINK(inode))
+               newflags |= EXT3_IUNLINK_FL;
+       if (IS_BARRIER(inode))
+               newflags |= EXT3_BARRIER_FL;
+
+       /* we do not want to copy superblock flags */
+       if (inode->i_flags & S_NOATIME)
+               newflags |= EXT3_NOATIME_FL;
+       if (inode->i_flags & S_SYNC)
+               newflags |= EXT3_SYNC_FL;
+       if (inode->i_flags & S_DIRSYNC)
+               newflags |= EXT3_DIRSYNC_FL;
+
+       if (oldflags ^ newflags) {
+               handle_t *handle;
+               struct ext3_iloc iloc;
+
+               handle = ext3_journal_start(inode, 1);
+               if (IS_ERR(handle))
+                       return PTR_ERR(handle);
+               if (IS_SYNC(inode))
+                       handle->h_sync = 1;
+               err = ext3_reserve_inode_write(handle, inode, &iloc);
+               if (err)
+                       goto flags_err;
+
+               EXT3_I(inode)->i_flags = newflags;
+               inode->i_ctime = CURRENT_TIME;
+
+               err = ext3_mark_iloc_dirty(handle, inode, &iloc);
+       flags_err:
+               ext3_journal_stop(handle);
+       }
+       return err;
+}
+
 void ext3_read_inode(struct inode * inode)
 {
        struct ext3_iloc iloc;
@@ -2433,7 +2507,7 @@ void ext3_read_inode(struct inode * inode)
        ei->i_acl = EXT3_ACL_NOT_CACHED;
        ei->i_default_acl = EXT3_ACL_NOT_CACHED;
 #endif
-       ei->i_rsv_window.rsv_end = EXT3_RESERVE_WINDOW_NOT_ALLOCATED;
+       ei->i_block_alloc_info = NULL;
 
        if (__ext3_get_inode_loc(inode, &iloc, 0))
                goto bad_inode;
@@ -2459,8 +2533,6 @@ void ext3_read_inode(struct inode * inode)
        inode->i_atime.tv_nsec = inode->i_ctime.tv_nsec = inode->i_mtime.tv_nsec = 0;
 
        ei->i_state = 0;
-       ei->i_next_alloc_block = 0;
-       ei->i_next_alloc_goal = 0;
        ei->i_dir_start_lookup = 0;
        ei->i_dtime = le32_to_cpu(raw_inode->i_dtime);
        /* We now have enough fields to check if the inode was active or not.
@@ -2500,10 +2572,6 @@ void ext3_read_inode(struct inode * inode)
        ei->i_disksize = inode->i_size;
        inode->i_generation = le32_to_cpu(raw_inode->i_generation);
        ei->i_block_group = iloc.block_group;
-       ei->i_rsv_window.rsv_start = 0;
-       ei->i_rsv_window.rsv_end= 0;
-       atomic_set(&ei->i_rsv_window.rsv_goal_size, EXT3_DEFAULT_RESERVE_BLOCKS);
-       seqlock_init(&ei->i_rsv_window.rsv_seqlock);
        /*
         * NOTE! The in-memory inode i_data array is in little-endian order
         * even on big-endian machines: we do NOT byteswap the block numbers!
@@ -2677,7 +2745,7 @@ static int ext3_do_update_inode(handle_t *handle,
        } else for (block = 0; block < EXT3_N_BLOCKS; block++)
                raw_inode->i_block[block] = ei->i_data[block];
 
-       if (EXT3_INODE_SIZE(inode->i_sb) > EXT3_GOOD_OLD_INODE_SIZE)
+       if (ei->i_extra_isize)
                raw_inode->i_extra_isize = cpu_to_le16(ei->i_extra_isize);
 
        BUFFER_TRACE(bh, "call ext3_journal_dirty_metadata");
@@ -2744,44 +2812,6 @@ int ext3_write_inode(struct inode *inode, int wait)
        return ext3_force_commit(inode->i_sb);
 }
 
-int ext3_setattr_flags(struct inode *inode, unsigned int flags)
-{
-       unsigned int oldflags, newflags;
-       int err = 0;
-
-       oldflags = EXT3_I(inode)->i_flags;
-       newflags = oldflags &
-               ~(EXT3_IMMUTABLE_FL | EXT3_IUNLINK_FL | EXT3_BARRIER_FL);
-       if (flags & ATTR_FLAG_IMMUTABLE)
-               newflags |= EXT3_IMMUTABLE_FL;
-       if (flags & ATTR_FLAG_IUNLINK)
-               newflags |= EXT3_IUNLINK_FL;
-       if (flags & ATTR_FLAG_BARRIER)
-               newflags |= EXT3_BARRIER_FL;
-
-       if (oldflags ^ newflags) {
-               handle_t *handle;
-               struct ext3_iloc iloc;
-
-               handle = ext3_journal_start(inode, 1);
-               if (IS_ERR(handle))
-                       return PTR_ERR(handle);
-               if (IS_SYNC(inode))
-                       handle->h_sync = 1;
-               err = ext3_reserve_inode_write(handle, inode, &iloc);
-               if (err)
-                       goto flags_err;
-
-               EXT3_I(inode)->i_flags = newflags;
-               inode->i_ctime = CURRENT_TIME;
-
-               err = ext3_mark_iloc_dirty(handle, inode, &iloc);
-       flags_err:
-               ext3_journal_stop(handle);
-       }
-       return err;
-}
-
 /*
  * ext3_setattr()
  *
@@ -2816,7 +2846,8 @@ int ext3_setattr(struct dentry *dentry, struct iattr *attr)
 
                /* (user+group)*(old+new) structure, inode write (sb,
                 * inode block, ? - but truncate inode update has it) */
-               handle = ext3_journal_start(inode, 4*EXT3_QUOTA_INIT_BLOCKS+3);
+               handle = ext3_journal_start(inode, 2*(EXT3_QUOTA_INIT_BLOCKS(inode->i_sb)+
+                                       EXT3_QUOTA_DEL_BLOCKS(inode->i_sb))+3);
                if (IS_ERR(handle)) {
                        error = PTR_ERR(handle);
                        goto err_out;
@@ -2832,9 +2863,7 @@ int ext3_setattr(struct dentry *dentry, struct iattr *attr)
                        inode->i_uid = attr->ia_uid;
                if (attr->ia_valid & ATTR_GID)
                        inode->i_gid = attr->ia_gid;
-               if ((attr->ia_valid & ATTR_XID)
-                       && inode->i_sb
-                       && (inode->i_sb->s_flags & MS_TAGXID))
+               if ((attr->ia_valid & ATTR_XID) && IS_TAGXID(inode))
                        inode->i_xid = attr->ia_xid;
                error = ext3_mark_inode_dirty(handle, inode);
                ext3_journal_stop(handle);
@@ -2858,12 +2887,6 @@ int ext3_setattr(struct dentry *dentry, struct iattr *attr)
                ext3_journal_stop(handle);
        }
 
-       if (ia_valid & ATTR_ATTR_FLAG) {
-               rc = ext3_setattr_flags(inode, attr->ia_attr_flags);
-               if (!error)
-                       error = rc;
-       }
-
        rc = inode_setattr(inode, attr);
 
        /* If inode_setattr's call to ext3_truncate failed to get a
@@ -2924,7 +2947,7 @@ static int ext3_writepage_trans_blocks(struct inode *inode)
 #ifdef CONFIG_QUOTA
        /* We know that structure was already allocated during DQUOT_INIT so
         * we will be updating only the data blocks + inodes */
-       ret += 2*EXT3_QUOTA_TRANS_BLOCKS;
+       ret += 2*EXT3_QUOTA_TRANS_BLOCKS(inode->i_sb);
 #endif
 
        return ret;