Commit a91ea69f authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

[GFS2] Align all labels against LH side 



This makes everything consistent.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 75d3b817

fs/gfs2/acl.c

+5 −9
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ int gfs2_acl_validate_set(struct gfs2_inode *ip, int access, 


out:

	posix_acl_release(acl);



	return error;

}
@@ -139,11 +138,9 @@ static int acl_get(struct gfs2_inode *ip, int access, struct posix_acl **acl, 
		*data = er.er_data;

		*len = er.er_data_len;

	}



out:

	if (error || el == &el_this)

		brelse(el->el_bh);



	return error;

}
@@ -307,7 +304,6 @@ int gfs2_acl_chmod(struct gfs2_inode *ip, struct iattr *attr) 
	posix_acl_release(acl);

	brelse(el.el_bh);

	kfree(data);



	return error;

}

fs/gfs2/bmap.c

+13 −26
Original line number Diff line number Diff line
@@ -172,10 +172,8 @@ int gfs2_unstuff_dinode(struct gfs2_inode *ip, struct page *page) 


out_brelse:

	brelse(dibh);



out:

	up_write(&ip->i_rw_mutex);



	return error;

}
@@ -644,7 +642,6 @@ static int recursive_scan(struct gfs2_inode *ip, struct buffer_head *dibh, 


out:

	brelse(bh);



	return error;

}
@@ -790,13 +787,10 @@ static int do_strip(struct gfs2_inode *ip, struct buffer_head *dibh, 


out_rg_gunlock:

	gfs2_glock_dq_m(rlist.rl_rgrps, rlist.rl_ghs);



out_rlist:

	gfs2_rlist_free(&rlist);



out:

	gfs2_glock_dq_uninit(&ip->i_alloc.al_ri_gh);



	return error;

}
@@ -870,16 +864,12 @@ static int do_grow(struct gfs2_inode *ip, uint64_t size) 


out_end_trans:

	gfs2_trans_end(sdp);



out_ipres:

	gfs2_inplace_release(ip);



out_gunlock_q:

	gfs2_quota_unlock(ip);



out:

	gfs2_alloc_put(ip);



	return error;

}
@@ -1000,7 +990,6 @@ static int trunc_start(struct gfs2_inode *ip, uint64_t size) 


out:

	gfs2_trans_end(sdp);



	return error;

}
@@ -1072,9 +1061,7 @@ static int trunc_end(struct gfs2_inode *ip) 


out:

	up_write(&ip->i_rw_mutex);



	gfs2_trans_end(sdp);



	return error;

}

fs/gfs2/dir.c

+6 −12
Original line number Diff line number Diff line
@@ -1136,7 +1136,6 @@ static int dir_double_exhash(struct gfs2_inode *dip) 


fail:

	kfree(buf);



	return error;

}
@@ -1892,21 +1891,16 @@ static int leaf_dealloc(struct gfs2_inode *dip, uint32_t index, uint32_t len, 


out_end_trans:

	gfs2_trans_end(sdp);



out_rg_gunlock:

	gfs2_glock_dq_m(rlist.rl_rgrps, rlist.rl_ghs);



out_rlist:

	gfs2_rlist_free(&rlist);

	gfs2_glock_dq_uninit(&dip->i_alloc.al_ri_gh);



out_qs:

	gfs2_quota_unhold(dip);



out:

	gfs2_alloc_put(dip);

	kfree(ht);



	return error;

}

fs/gfs2/eattr.c

+21 −41
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ static int ea_foreach(struct gfs2_inode *ip, ea_call_t ea_call, void *data) 
	}

out:

	brelse(bh);



	return error;

}
@@ -321,7 +320,6 @@ static int ea_dealloc_unstuffed(struct gfs2_inode *ip, struct buffer_head *bh, 


out_gunlock:

	gfs2_glock_dq_uninit(&rg_gh);



	return error;

}
@@ -350,10 +348,8 @@ static int ea_remove_unstuffed(struct gfs2_inode *ip, struct buffer_head *bh, 


out_quota:

	gfs2_quota_unhold(ip);



out_alloc:

	gfs2_alloc_put(ip);



	return error;

}
@@ -508,7 +504,6 @@ static int ea_get_unstuffed(struct gfs2_inode *ip, struct gfs2_ea_header *ea, 


out:

	kfree(bh);



	return error;

}
@@ -749,16 +744,12 @@ static int ea_alloc_skeleton(struct gfs2_inode *ip, struct gfs2_ea_request *er, 


out_end_trans:

	gfs2_trans_end(GFS2_SB(&ip->i_inode));



out_ipres:

	gfs2_inplace_release(ip);



out_gunlock_q:

	gfs2_quota_unlock(ip);



out:

	gfs2_alloc_put(ip);



	return error;

}
@@ -886,7 +877,6 @@ static int ea_set_simple_noalloc(struct gfs2_inode *ip, struct buffer_head *bh, 
	brelse(dibh);

out:

	gfs2_trans_end(GFS2_SB(&ip->i_inode));



	return error;

}
@@ -1027,7 +1017,6 @@ static int ea_set_block(struct gfs2_inode *ip, struct gfs2_ea_request *er, 


out:

	brelse(indbh);



	return error;

}
@@ -1287,13 +1276,11 @@ static int ea_acl_chmod_unstuffed(struct gfs2_inode *ip, 


out:

	kfree(bh);



	return error;



fail:

	gfs2_trans_end(sdp);

	kfree(bh);



	return error;

}
@@ -1444,13 +1431,10 @@ static int ea_dealloc_indirect(struct gfs2_inode *ip) 


out_gunlock:

	gfs2_glock_dq_m(rlist.rl_rgrps, rlist.rl_ghs);



out_rlist_free:

	gfs2_rlist_free(&rlist);



out:

	brelse(indbh);



	return error;

}
@@ -1496,7 +1480,6 @@ static int ea_dealloc_block(struct gfs2_inode *ip) 


out_gunlock:

	gfs2_glock_dq_uninit(&al->al_rgd_gh);



	return error;

}
@@ -1536,13 +1519,10 @@ int gfs2_ea_dealloc(struct gfs2_inode *ip) 


out_rindex:

	gfs2_glock_dq_uninit(&al->al_ri_gh);



out_quota:

	gfs2_quota_unhold(ip);



out_alloc:

	gfs2_alloc_put(ip);



	return error;

}

fs/gfs2/glock.c

+1 −2
Original line number Diff line number Diff line
@@ -2181,7 +2181,6 @@ static int dump_glock(struct gfs2_glock *gl) 


out:

	spin_unlock(&gl->gl_spin);



	return error;

}