GFS2: Optimise glock lru and end of life inodes

[deliverable/linux.git] / fs / gfs2 / inode.c

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 9134dcb894790adfd487101565703e4e24a37075..9b7b9e40073bc439df6f0c43255c25f75a7dfda5 100644 (file)
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -341,65 +341,6 @@ int gfs2_inode_refresh(struct gfs2_inode *ip)
        return error;
 }
 
-int gfs2_dinode_dealloc(struct gfs2_inode *ip)
-{
-       struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
-       struct gfs2_alloc *al;
-       struct gfs2_rgrpd *rgd;
-       int error;
-
-       if (gfs2_get_inode_blocks(&ip->i_inode) != 1) {
-               if (gfs2_consist_inode(ip))
-                       gfs2_dinode_print(ip);
-               return -EIO;
-       }
-
-       al = gfs2_alloc_get(ip);
-       if (!al)
-               return -ENOMEM;
-
-       error = gfs2_quota_hold(ip, NO_QUOTA_CHANGE, NO_QUOTA_CHANGE);
-       if (error)
-               goto out;
-
-       error = gfs2_rindex_hold(sdp, &al->al_ri_gh);
-       if (error)
-               goto out_qs;
-
-       rgd = gfs2_blk2rgrpd(sdp, ip->i_no_addr);
-       if (!rgd) {
-               gfs2_consist_inode(ip);
-               error = -EIO;
-               goto out_rindex_relse;
-       }
-
-       error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 0,
-                                  &al->al_rgd_gh);
-       if (error)
-               goto out_rindex_relse;
-
-       error = gfs2_trans_begin(sdp, RES_RG_BIT + RES_STATFS + RES_QUOTA, 1);
-       if (error)
-               goto out_rg_gunlock;
-
-       set_bit(GLF_DIRTY, &ip->i_gl->gl_flags);
-       set_bit(GLF_LFLUSH, &ip->i_gl->gl_flags);
-
-       gfs2_free_di(rgd, ip);
-
-       gfs2_trans_end(sdp);
-
-out_rg_gunlock:
-       gfs2_glock_dq_uninit(&al->al_rgd_gh);
-out_rindex_relse:
-       gfs2_glock_dq_uninit(&al->al_ri_gh);
-out_qs:
-       gfs2_quota_unhold(ip);
-out:
-       gfs2_alloc_put(ip);
-       return error;
-}
-
 /**
  * gfs2_change_nlink - Change nlink count on inode
  * @ip: The GFS2 inode