aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/dir.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/gfs2/dir.c')
-rw-r--r--fs/gfs2/dir.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index 7b8a38eaa41a..59d0cbcaecff 100644
--- a/fs/gfs2/dir.c
+++ b/fs/gfs2/dir.c
@@ -1134,9 +1134,8 @@ static int dir_double_exhash(struct gfs2_inode *dip)
1134 1134
1135 return error; 1135 return error;
1136 1136
1137 fail: 1137fail:
1138 kfree(buf); 1138 kfree(buf);
1139
1140 return error; 1139 return error;
1141} 1140}
1142 1141
@@ -1890,23 +1889,18 @@ static int leaf_dealloc(struct gfs2_inode *dip, uint32_t index, uint32_t len,
1890 gfs2_dinode_out(&dip->i_di, dibh->b_data); 1889 gfs2_dinode_out(&dip->i_di, dibh->b_data);
1891 brelse(dibh); 1890 brelse(dibh);
1892 1891
1893 out_end_trans: 1892out_end_trans:
1894 gfs2_trans_end(sdp); 1893 gfs2_trans_end(sdp);
1895 1894out_rg_gunlock:
1896 out_rg_gunlock:
1897 gfs2_glock_dq_m(rlist.rl_rgrps, rlist.rl_ghs); 1895 gfs2_glock_dq_m(rlist.rl_rgrps, rlist.rl_ghs);
1898 1896out_rlist:
1899 out_rlist:
1900 gfs2_rlist_free(&rlist); 1897 gfs2_rlist_free(&rlist);
1901 gfs2_glock_dq_uninit(&dip->i_alloc.al_ri_gh); 1898 gfs2_glock_dq_uninit(&dip->i_alloc.al_ri_gh);
1902 1899out_qs:
1903 out_qs:
1904 gfs2_quota_unhold(dip); 1900 gfs2_quota_unhold(dip);
1905 1901out:
1906 out:
1907 gfs2_alloc_put(dip); 1902 gfs2_alloc_put(dip);
1908 kfree(ht); 1903 kfree(ht);
1909
1910 return error; 1904 return error;
1911} 1905}
1912 1906