1 files changed, 12 insertions, 10 deletions

diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index b0248c6d5d4c..05dea8132fc0 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -820,7 +820,7 @@ int ext3_get_blocks_handle(handle_t *handle, struct inode *inode,
                 while (count < maxblocks && count <= blocks_to_boundary) {
                         ext3_fsblk_t blk;
 
-                        if (!verify_chain(chain, partial)) {
+                        if (!verify_chain(chain, chain + depth - 1)) {
                                 /*
                                  * Indirect block might be removed by
                                  * truncate while we were reading it.
@@ -2374,7 +2374,7 @@ void ext3_truncate(struct inode *inode)
         struct page *page;
 
         if (!ext3_can_truncate(inode))
-                return;
+                goto out_notrans;
 
         if (inode->i_size == 0 && ext3_should_writeback_data(inode))
                 ei->i_state |= EXT3_STATE_FLUSH_ON_CLOSE;
@@ -2390,7 +2390,7 @@ void ext3_truncate(struct inode *inode)
                 page = grab_cache_page(mapping,
                                 inode->i_size >> PAGE_CACHE_SHIFT);
                 if (!page)
-                        return;
+                        goto out_notrans;
         }
 
         handle = start_transaction(inode);
@@ -2401,7 +2401,7 @@ void ext3_truncate(struct inode *inode)
                         unlock_page(page);
                         page_cache_release(page);
                 }
-                return;         /* AKPM: return what? */
+                goto out_notrans;
         }
 
         last_block = (inode->i_size + blocksize-1)
@@ -2525,6 +2525,14 @@ out_stop:
                 ext3_orphan_del(handle, inode);
 
         ext3_journal_stop(handle);
+        return;
+out_notrans:
+        /*
+         * Delete the inode from orphan list so that it doesn't stay there
+         * forever and trigger assertion on umount.
+         */
+        if (inode->i_nlink)
+                ext3_orphan_del(NULL, inode);
 }
 
 static ext3_fsblk_t ext3_get_inode_block(struct super_block *sb,
@@ -3122,12 +3130,6 @@ int ext3_setattr(struct dentry *dentry, struct iattr *attr)
 
         rc = inode_setattr(inode, attr);
 
-        /* If inode_setattr's call to ext3_truncate failed to get a
-         * transaction handle at all, we need to clean up the in-core
-         * orphan list manually. */
-        if (inode->i_nlink)
-                ext3_orphan_del(NULL, inode);
-
         if (!rc && (ia_valid & ATTR_MODE))
                 rc = ext3_acl_chmod(inode);