---

yaml
---
r: 38815
b: refs/heads/master
c: a91ea69
h: refs/heads/master
i:
  38813: ab58d24
  38811: 0a07777
  38807: 565c348
  38799: d512456
  38783: 6d0c230
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75d3b817a0b48425da921052955cc58f20bbab52
+refs/heads/master: a91ea69ffd3f8a0b7139bfd44042ab384461e631

trunk/fs/gfs2/acl.c

@@ -65,9 +65,8 @@ int gfs2_acl_validate_set(struct gfs2_inode *ip, int access,
 			error = 0;
 	}
 
- out:
+out:
 	posix_acl_release(acl);
-
 	return error;
 }
 
@@ -132,18 +131,16 @@ static int acl_get(struct gfs2_inode *ip, int access, struct posix_acl **acl,
 			error = PTR_ERR(*acl);
 	}
 
- out_kfree:
+out_kfree:
 	if (error || !data)
 		kfree(er.er_data);
 	else {
 		*data = er.er_data;
 		*len = er.er_data_len;
 	}
-
- out:
+out:
 	if (error || el == &el_this)
 		brelse(el->el_bh);
-
 	return error;
 }
 
@@ -270,7 +267,7 @@ int gfs2_acl_create(struct gfs2_inode *dip, struct gfs2_inode *ip)
 	} else
 		munge_mode(ip, mode);
 
- out:
+out:
 	posix_acl_release(acl);
 	kfree(er.er_data);
 	return error;
@@ -303,11 +300,10 @@ int gfs2_acl_chmod(struct gfs2_inode *ip, struct iattr *attr)
 		error = gfs2_ea_acl_chmod(ip, &el, attr, data);
 	}
 
- out:
+out:
 	posix_acl_release(acl);
 	brelse(el.el_bh);
 	kfree(data);
-
 	return error;
 }
 

trunk/fs/gfs2/bmap.c

@@ -170,12 +170,10 @@ int gfs2_unstuff_dinode(struct gfs2_inode *ip, struct page *page)
 
 	gfs2_dinode_out(&ip->i_di, dibh->b_data);
 
- out_brelse:
+out_brelse:
 	brelse(dibh);
-
- out:
+out:
 	up_write(&ip->i_rw_mutex);
-
 	return error;
 }
 
@@ -642,9 +640,8 @@ static int recursive_scan(struct gfs2_inode *ip, struct buffer_head *dibh,
 				break;
 		}
 
- out:
+out:
 	brelse(bh);
-
 	return error;
 }
 
@@ -788,15 +785,12 @@ static int do_strip(struct gfs2_inode *ip, struct buffer_head *dibh,
 
 	gfs2_trans_end(sdp);
 
- out_rg_gunlock:
+out_rg_gunlock:
 	gfs2_glock_dq_m(rlist.rl_rgrps, rlist.rl_ghs);
-
- out_rlist:
+out_rlist:
 	gfs2_rlist_free(&rlist);
-
- out:
+out:
 	gfs2_glock_dq_uninit(&ip->i_alloc.al_ri_gh);
-
 	return error;
 }
 
@@ -868,18 +862,14 @@ static int do_grow(struct gfs2_inode *ip, uint64_t size)
 	gfs2_dinode_out(&ip->i_di, dibh->b_data);
 	brelse(dibh);
 
- out_end_trans:
+out_end_trans:
 	gfs2_trans_end(sdp);
-
- out_ipres:
+out_ipres:
 	gfs2_inplace_release(ip);
-
- out_gunlock_q:
+out_gunlock_q:
 	gfs2_quota_unlock(ip);
-
- out:
+out:
 	gfs2_alloc_put(ip);
-
 	return error;
 }
 
@@ -998,9 +988,8 @@ static int trunc_start(struct gfs2_inode *ip, uint64_t size)
 
 	brelse(dibh);
 
- out:
+out:
 	gfs2_trans_end(sdp);
-
 	return error;
 }
 
@@ -1035,7 +1024,7 @@ static int trunc_dealloc(struct gfs2_inode *ip, uint64_t size)
 
 	gfs2_quota_unhold(ip);
 
- out:
+out:
 	gfs2_alloc_put(ip);
 	return error;
 }
@@ -1070,11 +1059,9 @@ static int trunc_end(struct gfs2_inode *ip)
 	gfs2_dinode_out(&ip->i_di, dibh->b_data);
 	brelse(dibh);
 
- out:
+out:
 	up_write(&ip->i_rw_mutex);
-
 	gfs2_trans_end(sdp);
-
 	return error;
 }
 

trunk/fs/gfs2/dir.c

@@ -1134,9 +1134,8 @@ static int dir_double_exhash(struct gfs2_inode *dip)
 
 	return error;
 
- fail:
+fail:
 	kfree(buf);
-
 	return error;
 }
 
@@ -1890,23 +1889,18 @@ static int leaf_dealloc(struct gfs2_inode *dip, uint32_t index, uint32_t len,
 	gfs2_dinode_out(&dip->i_di, dibh->b_data);
 	brelse(dibh);
 
- out_end_trans:
+out_end_trans:
 	gfs2_trans_end(sdp);
-
- out_rg_gunlock:
+out_rg_gunlock:
 	gfs2_glock_dq_m(rlist.rl_rgrps, rlist.rl_ghs);
-
- out_rlist:
+out_rlist:
 	gfs2_rlist_free(&rlist);
 	gfs2_glock_dq_uninit(&dip->i_alloc.al_ri_gh);
-
- out_qs:
+out_qs:
 	gfs2_quota_unhold(dip);
-
- out:
+out:
 	gfs2_alloc_put(dip);
 	kfree(ht);
-
 	return error;
 }
 

trunk/fs/gfs2/eattr.c

@@ -107,7 +107,7 @@ static int ea_foreach_i(struct gfs2_inode *ip, struct buffer_head *bh,
 
 	return error;
 
- fail:
+fail:
 	gfs2_consist_inode(ip);
 	return -EIO;
 }
@@ -152,9 +152,8 @@ static int ea_foreach(struct gfs2_inode *ip, ea_call_t ea_call, void *data)
 		if (error)
 			break;
 	}
- out:
+out:
 	brelse(bh);
-
 	return error;
 }
 
@@ -319,9 +318,8 @@ static int ea_dealloc_unstuffed(struct gfs2_inode *ip, struct buffer_head *bh,
 
 	gfs2_trans_end(sdp);
 
- out_gunlock:
+out_gunlock:
 	gfs2_glock_dq_uninit(&rg_gh);
-
 	return error;
 }
 
@@ -348,12 +346,10 @@ static int ea_remove_unstuffed(struct gfs2_inode *ip, struct buffer_head *bh,
 
 	gfs2_glock_dq_uninit(&al->al_ri_gh);
 
- out_quota:
+out_quota:
 	gfs2_quota_unhold(ip);
-
- out_alloc:
+out_alloc:
 	gfs2_alloc_put(ip);
-
 	return error;
 }
 
@@ -506,9 +502,8 @@ static int ea_get_unstuffed(struct gfs2_inode *ip, struct gfs2_ea_header *ea,
 		brelse(bh[x]);
 	}
 
- out:
+out:
 	kfree(bh);
-
 	return error;
 }
 
@@ -747,18 +742,14 @@ static int ea_alloc_skeleton(struct gfs2_inode *ip, struct gfs2_ea_request *er,
 		brelse(dibh);
 	}
 
- out_end_trans:
+out_end_trans:
 	gfs2_trans_end(GFS2_SB(&ip->i_inode));
-
- out_ipres:
+out_ipres:
 	gfs2_inplace_release(ip);
-
- out_gunlock_q:
+out_gunlock_q:
 	gfs2_quota_unlock(ip);
-
- out:
+out:
 	gfs2_alloc_put(ip);
-
 	return error;
 }
 
@@ -884,9 +875,8 @@ static int ea_set_simple_noalloc(struct gfs2_inode *ip, struct buffer_head *bh,
 	gfs2_trans_add_bh(ip->i_gl, dibh, 1);
 	gfs2_dinode_out(&ip->i_di, dibh->b_data);
 	brelse(dibh);
- out:
+out:
 	gfs2_trans_end(GFS2_SB(&ip->i_inode));
-
 	return error;
 }
 
@@ -1025,9 +1015,8 @@ static int ea_set_block(struct gfs2_inode *ip, struct gfs2_ea_request *er,
 	if (private)
 		ea_set_remove_stuffed(ip, (struct gfs2_ea_location *)private);
 
- out:
+out:
 	brelse(indbh);
-
 	return error;
 }
 
@@ -1285,15 +1274,13 @@ static int ea_acl_chmod_unstuffed(struct gfs2_inode *ip,
 		brelse(bh[x]);
 	}
 
- out:
+out:
 	kfree(bh);
-
 	return error;
 
- fail:
+fail:
 	gfs2_trans_end(sdp);
 	kfree(bh);
-
 	return error;
 }
 
@@ -1442,15 +1429,12 @@ static int ea_dealloc_indirect(struct gfs2_inode *ip)
 
 	gfs2_trans_end(sdp);
 
- out_gunlock:
+out_gunlock:
 	gfs2_glock_dq_m(rlist.rl_rgrps, rlist.rl_ghs);
-
- out_rlist_free:
+out_rlist_free:
 	gfs2_rlist_free(&rlist);
-
- out:
+out:
 	brelse(indbh);
-
 	return error;
 }
 
@@ -1494,9 +1478,8 @@ static int ea_dealloc_block(struct gfs2_inode *ip)
 
 	gfs2_trans_end(sdp);
 
- out_gunlock:
+out_gunlock:
 	gfs2_glock_dq_uninit(&al->al_rgd_gh);
-
 	return error;
 }
 
@@ -1534,15 +1517,12 @@ int gfs2_ea_dealloc(struct gfs2_inode *ip)
 
 	error = ea_dealloc_block(ip);
 
- out_rindex:
+out_rindex:
 	gfs2_glock_dq_uninit(&al->al_ri_gh);
-
- out_quota:
+out_quota:
 	gfs2_quota_unhold(ip);
-
- out_alloc:
+out_alloc:
 	gfs2_alloc_put(ip);
-
 	return error;
 }
 

trunk/fs/gfs2/glock.c

@@ -2179,9 +2179,8 @@ static int dump_glock(struct gfs2_glock *gl)
 
 	error = 0;
 
- out:
+out:
 	spin_unlock(&gl->gl_spin);
-
 	return error;
 }
 

trunk/fs/gfs2/lm.c

@@ -76,7 +76,7 @@ int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent)
 		sdp->sd_args.ar_localcaching = 1;
 	}
 
- out:
+out:
 	return error;
 }
 

trunk/fs/gfs2/locking/dlm/lock.c

@@ -437,7 +437,7 @@ static int hold_null_lock(struct gdlm_lock *lp)
 		gdlm_delete_lp(lpn);
 		lpn = NULL;
 	}
- out:
+out:
 	lp->hold_null = lpn;
 	return error;
 }