---

yaml
---
r: 38826
b: refs/heads/master
c: ea67eed
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2f7ba5237e2fe10ba3e328a4f728b9e1ff141da
+refs/heads/master: ea67eedb211d3418fa62fe3477e0d19b2888225e

trunk/fs/gfs2/glops.c

@@ -492,7 +492,7 @@ static int quota_go_demote_ok(struct gfs2_glock *gl)
 const struct gfs2_glock_operations gfs2_meta_glops = {
 	.go_xmote_th = gfs2_glock_xmote_th,
 	.go_drop_th = gfs2_glock_drop_th,
-	.go_type = LM_TYPE_META
+	.go_type = LM_TYPE_META,
 };
 
 const struct gfs2_glock_operations gfs2_inode_glops = {
@@ -505,7 +505,7 @@ const struct gfs2_glock_operations gfs2_inode_glops = {
 	.go_lock = inode_go_lock,
 	.go_unlock = inode_go_unlock,
 	.go_greedy = inode_greedy,
-	.go_type = LM_TYPE_INODE
+	.go_type = LM_TYPE_INODE,
 };
 
 const struct gfs2_glock_operations gfs2_rgrp_glops = {
@@ -516,45 +516,45 @@ const struct gfs2_glock_operations gfs2_rgrp_glops = {
 	.go_demote_ok = rgrp_go_demote_ok,
 	.go_lock = rgrp_go_lock,
 	.go_unlock = rgrp_go_unlock,
-	.go_type = LM_TYPE_RGRP
+	.go_type = LM_TYPE_RGRP,
 };
 
 const struct gfs2_glock_operations gfs2_trans_glops = {
 	.go_xmote_th = trans_go_xmote_th,
 	.go_xmote_bh = trans_go_xmote_bh,
 	.go_drop_th = trans_go_drop_th,
-	.go_type = LM_TYPE_NONDISK
+	.go_type = LM_TYPE_NONDISK,
 };
 
 const struct gfs2_glock_operations gfs2_iopen_glops = {
 	.go_xmote_th = gfs2_glock_xmote_th,
 	.go_drop_th = gfs2_glock_drop_th,
 	.go_callback = gfs2_iopen_go_callback,
-	.go_type = LM_TYPE_IOPEN
+	.go_type = LM_TYPE_IOPEN,
 };
 
 const struct gfs2_glock_operations gfs2_flock_glops = {
 	.go_xmote_th = gfs2_glock_xmote_th,
 	.go_drop_th = gfs2_glock_drop_th,
-	.go_type = LM_TYPE_FLOCK
+	.go_type = LM_TYPE_FLOCK,
 };
 
 const struct gfs2_glock_operations gfs2_nondisk_glops = {
 	.go_xmote_th = gfs2_glock_xmote_th,
 	.go_drop_th = gfs2_glock_drop_th,
-	.go_type = LM_TYPE_NONDISK
+	.go_type = LM_TYPE_NONDISK,
 };
 
 const struct gfs2_glock_operations gfs2_quota_glops = {
 	.go_xmote_th = gfs2_glock_xmote_th,
 	.go_drop_th = gfs2_glock_drop_th,
 	.go_demote_ok = quota_go_demote_ok,
-	.go_type = LM_TYPE_QUOTA
+	.go_type = LM_TYPE_QUOTA,
 };
 
 const struct gfs2_glock_operations gfs2_journal_glops = {
 	.go_xmote_th = gfs2_glock_xmote_th,
 	.go_drop_th = gfs2_glock_drop_th,
-	.go_type = LM_TYPE_JOURNAL
+	.go_type = LM_TYPE_JOURNAL,
 };
 

trunk/fs/gfs2/lops.c

@@ -760,7 +760,7 @@ static void databuf_lo_after_commit(struct gfs2_sbd *sdp, struct gfs2_ail *ai)
 const struct gfs2_log_operations gfs2_glock_lops = {
 	.lo_add = glock_lo_add,
 	.lo_after_commit = glock_lo_after_commit,
-	.lo_name = "glock"
+	.lo_name = "glock",
 };
 
 const struct gfs2_log_operations gfs2_buf_lops = {
@@ -771,7 +771,7 @@ const struct gfs2_log_operations gfs2_buf_lops = {
 	.lo_before_scan = buf_lo_before_scan,
 	.lo_scan_elements = buf_lo_scan_elements,
 	.lo_after_scan = buf_lo_after_scan,
-	.lo_name = "buf"
+	.lo_name = "buf",
 };
 
 const struct gfs2_log_operations gfs2_revoke_lops = {
@@ -780,13 +780,13 @@ const struct gfs2_log_operations gfs2_revoke_lops = {
 	.lo_before_scan = revoke_lo_before_scan,
 	.lo_scan_elements = revoke_lo_scan_elements,
 	.lo_after_scan = revoke_lo_after_scan,
-	.lo_name = "revoke"
+	.lo_name = "revoke",
 };
 
 const struct gfs2_log_operations gfs2_rg_lops = {
 	.lo_add = rg_lo_add,
 	.lo_after_commit = rg_lo_after_commit,
-	.lo_name = "rg"
+	.lo_name = "rg",
 };
 
 const struct gfs2_log_operations gfs2_databuf_lops = {
@@ -796,7 +796,7 @@ const struct gfs2_log_operations gfs2_databuf_lops = {
 	.lo_after_commit = databuf_lo_after_commit,
 	.lo_scan_elements = databuf_lo_scan_elements,
 	.lo_after_scan = databuf_lo_after_scan,
-	.lo_name = "databuf"
+	.lo_name = "databuf",
 };
 
 const struct gfs2_log_operations *gfs2_log_ops[] = {
@@ -805,6 +805,6 @@ const struct gfs2_log_operations *gfs2_log_ops[] = {
 	&gfs2_revoke_lops,
 	&gfs2_rg_lops,
 	&gfs2_databuf_lops,
-	NULL
+	NULL,
 };
 

trunk/fs/gfs2/sys.c

@@ -253,7 +253,7 @@ static struct attribute *lockstruct_attrs[] = {
 	&lockstruct_attr_first.attr,
 	&lockstruct_attr_lvb_size.attr,
 	&lockstruct_attr_flags.attr,
-	NULL
+	NULL,
 };
 
 /*
@@ -310,7 +310,7 @@ static struct attribute *args_attrs[] = {
 	&args_attr_suiddir.attr,
 	&args_attr_data.attr,
 	&args_attr_noatime.attr,
-	NULL
+	NULL,
 };
 
 /*
@@ -339,7 +339,7 @@ static struct attribute *counters_attrs[] = {
 	&counters_attr_glock_held_count.attr,
 	&counters_attr_inode_count.attr,
 	&counters_attr_reclaimed.attr,
-	NULL
+	NULL,
 };
 
 /*
@@ -487,27 +487,27 @@ static struct attribute *tune_attrs[] = {
 	&tune_attr_quota_scale.attr,
 	&tune_attr_new_files_jdata.attr,
 	&tune_attr_new_files_directio.attr,
-	NULL
+	NULL,
 };
 
 static struct attribute_group lockstruct_group = {
 	.name = "lockstruct",
-	.attrs = lockstruct_attrs
+	.attrs = lockstruct_attrs,
 };
 
 static struct attribute_group counters_group = {
 	.name = "counters",
-	.attrs = counters_attrs
+	.attrs = counters_attrs,
 };
 
 static struct attribute_group args_group = {
 	.name = "args",
-	.attrs = args_attrs
+	.attrs = args_attrs,
 };
 
 static struct attribute_group tune_group = {
 	.name = "tune",
-	.attrs = tune_attrs
+	.attrs = tune_attrs,
 };
 
 int gfs2_sys_fs_add(struct gfs2_sbd *sdp)