3 files changed, 14 insertions, 5 deletions

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 892ac37de8ae..be5801a75406 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -267,6 +267,7 @@ struct gfs2_alloc {
 enum {
         GIF_INVALID             = 0,
         GIF_QD_LOCKED           = 1,
+        GIF_ALLOC_FAILED        = 2,
         GIF_SW_PAGED            = 3,
 };
 
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 900cf986aadc..044efe273b97 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -736,10 +736,12 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
 
 fail_gunlock2:
         gfs2_glock_dq_uninit(ghs + 1);
-        if (inode && !IS_ERR(inode))
-                iput(inode);
 fail_gunlock:
         gfs2_glock_dq_uninit(ghs);
+        if (inode && !IS_ERR(inode)) {
+                set_bit(GIF_ALLOC_FAILED, &GFS2_I(inode)->i_flags);
+                iput(inode);
+        }
 fail:
         if (bh)
                 brelse(bh);
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index afb87615c014..9961de702d1b 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -1471,9 +1471,11 @@ static void gfs2_evict_inode(struct inode *inode)
                 goto out;
         }
 
-        error = gfs2_check_blk_type(sdp, ip->i_no_addr, GFS2_BLKST_UNLINKED);
-        if (error)
-                goto out_truncate;
+        if (!test_bit(GIF_ALLOC_FAILED, &ip->i_flags)) {
+                error = gfs2_check_blk_type(sdp, ip->i_no_addr, GFS2_BLKST_UNLINKED);
+                if (error)
+                        goto out_truncate;
+        }
 
         if (test_bit(GIF_INVALID, &ip->i_flags)) {
                 error = gfs2_inode_refresh(ip);
@@ -1513,6 +1515,10 @@ static void gfs2_evict_inode(struct inode *inode)
         goto out_unlock;
 
 out_truncate:
+        gfs2_log_flush(sdp, ip->i_gl);
+        write_inode_now(inode, 1);
+        gfs2_ail_flush(ip->i_gl);
+
         /* Case 2 starts here */
         error = gfs2_trans_begin(sdp, 0, sdp->sd_jdesc->jd_blocks);
         if (error)