diff options
| -rw-r--r-- | fs/gfs2/super.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index 2a7692d70394..6d89d0ecec2a 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c | |||
| @@ -1630,8 +1630,6 @@ alloc_failed: | |||
| 1630 | goto out_truncate; | 1630 | goto out_truncate; |
| 1631 | } | 1631 | } |
| 1632 | 1632 | ||
| 1633 | /* Case 1 starts here */ | ||
| 1634 | |||
| 1635 | if (S_ISDIR(inode->i_mode) && | 1633 | if (S_ISDIR(inode->i_mode) && |
| 1636 | (ip->i_diskflags & GFS2_DIF_EXHASH)) { | 1634 | (ip->i_diskflags & GFS2_DIF_EXHASH)) { |
| 1637 | error = gfs2_dir_exhash_dealloc(ip); | 1635 | error = gfs2_dir_exhash_dealloc(ip); |
| @@ -1670,7 +1668,6 @@ out_truncate: | |||
| 1670 | write_inode_now(inode, 1); | 1668 | write_inode_now(inode, 1); |
| 1671 | gfs2_ail_flush(ip->i_gl, 0); | 1669 | gfs2_ail_flush(ip->i_gl, 0); |
| 1672 | 1670 | ||
| 1673 | /* Case 2 starts here */ | ||
| 1674 | error = gfs2_trans_begin(sdp, 0, sdp->sd_jdesc->jd_blocks); | 1671 | error = gfs2_trans_begin(sdp, 0, sdp->sd_jdesc->jd_blocks); |
| 1675 | if (error) | 1672 | if (error) |
| 1676 | goto out_unlock; | 1673 | goto out_unlock; |
| @@ -1680,7 +1677,6 @@ out_truncate: | |||
| 1680 | gfs2_trans_end(sdp); | 1677 | gfs2_trans_end(sdp); |
| 1681 | 1678 | ||
| 1682 | out_unlock: | 1679 | out_unlock: |
| 1683 | /* Error path for case 1 */ | ||
| 1684 | if (gfs2_rs_active(&ip->i_res)) | 1680 | if (gfs2_rs_active(&ip->i_res)) |
| 1685 | gfs2_rs_deltree(&ip->i_res); | 1681 | gfs2_rs_deltree(&ip->i_res); |
| 1686 | 1682 | ||
| @@ -1699,7 +1695,6 @@ out_unlock: | |||
| 1699 | if (error && error != GLR_TRYFAILED && error != -EROFS) | 1695 | if (error && error != GLR_TRYFAILED && error != -EROFS) |
| 1700 | fs_warn(sdp, "gfs2_evict_inode: %d\n", error); | 1696 | fs_warn(sdp, "gfs2_evict_inode: %d\n", error); |
| 1701 | out: | 1697 | out: |
| 1702 | /* Case 3 starts here */ | ||
| 1703 | truncate_inode_pages_final(&inode->i_data); | 1698 | truncate_inode_pages_final(&inode->i_data); |
| 1704 | gfs2_rsqa_delete(ip, NULL); | 1699 | gfs2_rsqa_delete(ip, NULL); |
| 1705 | gfs2_ordered_del_inode(ip); | 1700 | gfs2_ordered_del_inode(ip); |
