evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GFS2: pass leaf_bh into leaf_dealloc

Browse source 
Function foreach_leaf used to look up the leaf block address and get
a buffer_head.  Then it would call leaf_dealloc which did the same
lookup.  This patch combines the two operations by making foreach_leaf
pass the leaf bh to leaf_dealloc.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
Bob Peterson 2011-03-22 13:55:23 -04:00 • committed by Steven Whitehouse
parent d24a7a439a
commit ec038c826b
1 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
fs/gfs2/dir.c
View file

@ -86,7 +86,8 @@ typedef int (*gfs2_dscan_t)(const struct gfs2_dirent *dent,
const struct qstr *name, void *opaque); const struct qstr *name, void *opaque);
static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len, static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len,
u64 leaf_no, int last_dealloc); u64 leaf_no, struct buffer_head *leaf_bh,
int last_dealloc);
int gfs2_dir_get_new_buffer(struct gfs2_inode *ip, u64 block, int gfs2_dir_get_new_buffer(struct gfs2_inode *ip, u64 block,
struct buffer_head **bhp) struct buffer_head **bhp)
@ -1821,8 +1822,9 @@ static int foreach_leaf(struct gfs2_inode *dip)
len = 1 << (dip->i_depth - be16_to_cpu(leaf->lf_depth)); len = 1 << (dip->i_depth - be16_to_cpu(leaf->lf_depth));
next_index = (index & ~(len - 1)) + len; next_index = (index & ~(len - 1)) + len;
last = ((next_index >= hsize) ? 1 : 0); last = ((next_index >= hsize) ? 1 : 0);
error = leaf_dealloc(dip, index, len, leaf_no, bh,
last);
brelse(bh); brelse(bh);
error = leaf_dealloc(dip, index, len, leaf_no, last);
if (error) if (error)
goto out; goto out;
index = next_index; index = next_index;
@ -1847,13 +1849,15 @@ out:
* @index: the hash table offset in the directory * @index: the hash table offset in the directory
* @len: the number of pointers to this leaf * @len: the number of pointers to this leaf
* @leaf_no: the leaf number * @leaf_no: the leaf number
* @leaf_bh: buffer_head for the starting leaf
* last_dealloc: 1 if this is the final dealloc for the leaf, else 0 * last_dealloc: 1 if this is the final dealloc for the leaf, else 0
* *
* Returns: errno * Returns: errno
*/ */
static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len, static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len,
u64 leaf_no, int last_dealloc) u64 leaf_no, struct buffer_head *leaf_bh,
int last_dealloc)
{ {
struct gfs2_sbd *sdp = GFS2_SB(&dip->i_inode); struct gfs2_sbd *sdp = GFS2_SB(&dip->i_inode);
struct gfs2_leaf *tmp_leaf; struct gfs2_leaf *tmp_leaf;
@ -1885,14 +1889,18 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len,
goto out_qs; goto out_qs;
/* Count the number of leaves */ /* Count the number of leaves */
bh = leaf_bh;
for (blk = leaf_no; blk; blk = nblk) { for (blk = leaf_no; blk; blk = nblk) {
error = get_leaf(dip, blk, &bh); if (blk != leaf_no) {
if (error) error = get_leaf(dip, blk, &bh);
goto out_rlist; if (error)
goto out_rlist;
}
tmp_leaf = (struct gfs2_leaf *)bh->b_data; tmp_leaf = (struct gfs2_leaf *)bh->b_data;
nblk = be64_to_cpu(tmp_leaf->lf_next); nblk = be64_to_cpu(tmp_leaf->lf_next);
brelse(bh); if (blk != leaf_no)
brelse(bh);
gfs2_rlist_add(sdp, &rlist, blk); gfs2_rlist_add(sdp, &rlist, blk);
l_blocks++; l_blocks++;
@ -1916,13 +1924,18 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len,
if (error) if (error)
goto out_rg_gunlock; goto out_rg_gunlock;
bh = leaf_bh;
for (blk = leaf_no; blk; blk = nblk) { for (blk = leaf_no; blk; blk = nblk) {
error = get_leaf(dip, blk, &bh); if (blk != leaf_no) {
if (error) error = get_leaf(dip, blk, &bh);
goto out_end_trans; if (error)
goto out_end_trans;
}
tmp_leaf = (struct gfs2_leaf *)bh->b_data; tmp_leaf = (struct gfs2_leaf *)bh->b_data;
nblk = be64_to_cpu(tmp_leaf->lf_next); nblk = be64_to_cpu(tmp_leaf->lf_next);
brelse(bh); if (blk != leaf_no)
brelse(bh);
gfs2_free_meta(dip, blk, 1); gfs2_free_meta(dip, blk, 1);
gfs2_add_inode_blocks(&dip->i_inode, -1); gfs2_add_inode_blocks(&dip->i_inode, -1);