diff options
-rw-r--r-- | fs/gfs2/glops.c | 18 | ||||
-rw-r--r-- | fs/gfs2/lops.c | 12 | ||||
-rw-r--r-- | fs/gfs2/sys.c | 16 |
3 files changed, 23 insertions, 23 deletions
diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c index d3e7b082a918..0c50a720d01d 100644 --- a/fs/gfs2/glops.c +++ b/fs/gfs2/glops.c | |||
@@ -492,7 +492,7 @@ static int quota_go_demote_ok(struct gfs2_glock *gl) | |||
492 | const struct gfs2_glock_operations gfs2_meta_glops = { | 492 | const struct gfs2_glock_operations gfs2_meta_glops = { |
493 | .go_xmote_th = gfs2_glock_xmote_th, | 493 | .go_xmote_th = gfs2_glock_xmote_th, |
494 | .go_drop_th = gfs2_glock_drop_th, | 494 | .go_drop_th = gfs2_glock_drop_th, |
495 | .go_type = LM_TYPE_META | 495 | .go_type = LM_TYPE_META, |
496 | }; | 496 | }; |
497 | 497 | ||
498 | const struct gfs2_glock_operations gfs2_inode_glops = { | 498 | const struct gfs2_glock_operations gfs2_inode_glops = { |
@@ -505,7 +505,7 @@ const struct gfs2_glock_operations gfs2_inode_glops = { | |||
505 | .go_lock = inode_go_lock, | 505 | .go_lock = inode_go_lock, |
506 | .go_unlock = inode_go_unlock, | 506 | .go_unlock = inode_go_unlock, |
507 | .go_greedy = inode_greedy, | 507 | .go_greedy = inode_greedy, |
508 | .go_type = LM_TYPE_INODE | 508 | .go_type = LM_TYPE_INODE, |
509 | }; | 509 | }; |
510 | 510 | ||
511 | const struct gfs2_glock_operations gfs2_rgrp_glops = { | 511 | const struct gfs2_glock_operations gfs2_rgrp_glops = { |
@@ -516,45 +516,45 @@ const struct gfs2_glock_operations gfs2_rgrp_glops = { | |||
516 | .go_demote_ok = rgrp_go_demote_ok, | 516 | .go_demote_ok = rgrp_go_demote_ok, |
517 | .go_lock = rgrp_go_lock, | 517 | .go_lock = rgrp_go_lock, |
518 | .go_unlock = rgrp_go_unlock, | 518 | .go_unlock = rgrp_go_unlock, |
519 | .go_type = LM_TYPE_RGRP | 519 | .go_type = LM_TYPE_RGRP, |
520 | }; | 520 | }; |
521 | 521 | ||
522 | const struct gfs2_glock_operations gfs2_trans_glops = { | 522 | const struct gfs2_glock_operations gfs2_trans_glops = { |
523 | .go_xmote_th = trans_go_xmote_th, | 523 | .go_xmote_th = trans_go_xmote_th, |
524 | .go_xmote_bh = trans_go_xmote_bh, | 524 | .go_xmote_bh = trans_go_xmote_bh, |
525 | .go_drop_th = trans_go_drop_th, | 525 | .go_drop_th = trans_go_drop_th, |
526 | .go_type = LM_TYPE_NONDISK | 526 | .go_type = LM_TYPE_NONDISK, |
527 | }; | 527 | }; |
528 | 528 | ||
529 | const struct gfs2_glock_operations gfs2_iopen_glops = { | 529 | const struct gfs2_glock_operations gfs2_iopen_glops = { |
530 | .go_xmote_th = gfs2_glock_xmote_th, | 530 | .go_xmote_th = gfs2_glock_xmote_th, |
531 | .go_drop_th = gfs2_glock_drop_th, | 531 | .go_drop_th = gfs2_glock_drop_th, |
532 | .go_callback = gfs2_iopen_go_callback, | 532 | .go_callback = gfs2_iopen_go_callback, |
533 | .go_type = LM_TYPE_IOPEN | 533 | .go_type = LM_TYPE_IOPEN, |
534 | }; | 534 | }; |
535 | 535 | ||
536 | const struct gfs2_glock_operations gfs2_flock_glops = { | 536 | const struct gfs2_glock_operations gfs2_flock_glops = { |
537 | .go_xmote_th = gfs2_glock_xmote_th, | 537 | .go_xmote_th = gfs2_glock_xmote_th, |
538 | .go_drop_th = gfs2_glock_drop_th, | 538 | .go_drop_th = gfs2_glock_drop_th, |
539 | .go_type = LM_TYPE_FLOCK | 539 | .go_type = LM_TYPE_FLOCK, |
540 | }; | 540 | }; |
541 | 541 | ||
542 | const struct gfs2_glock_operations gfs2_nondisk_glops = { | 542 | const struct gfs2_glock_operations gfs2_nondisk_glops = { |
543 | .go_xmote_th = gfs2_glock_xmote_th, | 543 | .go_xmote_th = gfs2_glock_xmote_th, |
544 | .go_drop_th = gfs2_glock_drop_th, | 544 | .go_drop_th = gfs2_glock_drop_th, |
545 | .go_type = LM_TYPE_NONDISK | 545 | .go_type = LM_TYPE_NONDISK, |
546 | }; | 546 | }; |
547 | 547 | ||
548 | const struct gfs2_glock_operations gfs2_quota_glops = { | 548 | const struct gfs2_glock_operations gfs2_quota_glops = { |
549 | .go_xmote_th = gfs2_glock_xmote_th, | 549 | .go_xmote_th = gfs2_glock_xmote_th, |
550 | .go_drop_th = gfs2_glock_drop_th, | 550 | .go_drop_th = gfs2_glock_drop_th, |
551 | .go_demote_ok = quota_go_demote_ok, | 551 | .go_demote_ok = quota_go_demote_ok, |
552 | .go_type = LM_TYPE_QUOTA | 552 | .go_type = LM_TYPE_QUOTA, |
553 | }; | 553 | }; |
554 | 554 | ||
555 | const struct gfs2_glock_operations gfs2_journal_glops = { | 555 | const struct gfs2_glock_operations gfs2_journal_glops = { |
556 | .go_xmote_th = gfs2_glock_xmote_th, | 556 | .go_xmote_th = gfs2_glock_xmote_th, |
557 | .go_drop_th = gfs2_glock_drop_th, | 557 | .go_drop_th = gfs2_glock_drop_th, |
558 | .go_type = LM_TYPE_JOURNAL | 558 | .go_type = LM_TYPE_JOURNAL, |
559 | }; | 559 | }; |
560 | 560 | ||
diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c index 5898d6d3c1fe..07655a755619 100644 --- a/fs/gfs2/lops.c +++ b/fs/gfs2/lops.c | |||
@@ -760,7 +760,7 @@ static void databuf_lo_after_commit(struct gfs2_sbd *sdp, struct gfs2_ail *ai) | |||
760 | const struct gfs2_log_operations gfs2_glock_lops = { | 760 | const struct gfs2_log_operations gfs2_glock_lops = { |
761 | .lo_add = glock_lo_add, | 761 | .lo_add = glock_lo_add, |
762 | .lo_after_commit = glock_lo_after_commit, | 762 | .lo_after_commit = glock_lo_after_commit, |
763 | .lo_name = "glock" | 763 | .lo_name = "glock", |
764 | }; | 764 | }; |
765 | 765 | ||
766 | const struct gfs2_log_operations gfs2_buf_lops = { | 766 | const struct gfs2_log_operations gfs2_buf_lops = { |
@@ -771,7 +771,7 @@ const struct gfs2_log_operations gfs2_buf_lops = { | |||
771 | .lo_before_scan = buf_lo_before_scan, | 771 | .lo_before_scan = buf_lo_before_scan, |
772 | .lo_scan_elements = buf_lo_scan_elements, | 772 | .lo_scan_elements = buf_lo_scan_elements, |
773 | .lo_after_scan = buf_lo_after_scan, | 773 | .lo_after_scan = buf_lo_after_scan, |
774 | .lo_name = "buf" | 774 | .lo_name = "buf", |
775 | }; | 775 | }; |
776 | 776 | ||
777 | const struct gfs2_log_operations gfs2_revoke_lops = { | 777 | const struct gfs2_log_operations gfs2_revoke_lops = { |
@@ -780,13 +780,13 @@ const struct gfs2_log_operations gfs2_revoke_lops = { | |||
780 | .lo_before_scan = revoke_lo_before_scan, | 780 | .lo_before_scan = revoke_lo_before_scan, |
781 | .lo_scan_elements = revoke_lo_scan_elements, | 781 | .lo_scan_elements = revoke_lo_scan_elements, |
782 | .lo_after_scan = revoke_lo_after_scan, | 782 | .lo_after_scan = revoke_lo_after_scan, |
783 | .lo_name = "revoke" | 783 | .lo_name = "revoke", |
784 | }; | 784 | }; |
785 | 785 | ||
786 | const struct gfs2_log_operations gfs2_rg_lops = { | 786 | const struct gfs2_log_operations gfs2_rg_lops = { |
787 | .lo_add = rg_lo_add, | 787 | .lo_add = rg_lo_add, |
788 | .lo_after_commit = rg_lo_after_commit, | 788 | .lo_after_commit = rg_lo_after_commit, |
789 | .lo_name = "rg" | 789 | .lo_name = "rg", |
790 | }; | 790 | }; |
791 | 791 | ||
792 | const struct gfs2_log_operations gfs2_databuf_lops = { | 792 | const struct gfs2_log_operations gfs2_databuf_lops = { |
@@ -796,7 +796,7 @@ const struct gfs2_log_operations gfs2_databuf_lops = { | |||
796 | .lo_after_commit = databuf_lo_after_commit, | 796 | .lo_after_commit = databuf_lo_after_commit, |
797 | .lo_scan_elements = databuf_lo_scan_elements, | 797 | .lo_scan_elements = databuf_lo_scan_elements, |
798 | .lo_after_scan = databuf_lo_after_scan, | 798 | .lo_after_scan = databuf_lo_after_scan, |
799 | .lo_name = "databuf" | 799 | .lo_name = "databuf", |
800 | }; | 800 | }; |
801 | 801 | ||
802 | const struct gfs2_log_operations *gfs2_log_ops[] = { | 802 | const struct gfs2_log_operations *gfs2_log_ops[] = { |
@@ -805,6 +805,6 @@ const struct gfs2_log_operations *gfs2_log_ops[] = { | |||
805 | &gfs2_revoke_lops, | 805 | &gfs2_revoke_lops, |
806 | &gfs2_rg_lops, | 806 | &gfs2_rg_lops, |
807 | &gfs2_databuf_lops, | 807 | &gfs2_databuf_lops, |
808 | NULL | 808 | NULL, |
809 | }; | 809 | }; |
810 | 810 | ||
diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c index 8aefda22f98e..7a282a4bde2a 100644 --- a/fs/gfs2/sys.c +++ b/fs/gfs2/sys.c | |||
@@ -253,7 +253,7 @@ static struct attribute *lockstruct_attrs[] = { | |||
253 | &lockstruct_attr_first.attr, | 253 | &lockstruct_attr_first.attr, |
254 | &lockstruct_attr_lvb_size.attr, | 254 | &lockstruct_attr_lvb_size.attr, |
255 | &lockstruct_attr_flags.attr, | 255 | &lockstruct_attr_flags.attr, |
256 | NULL | 256 | NULL, |
257 | }; | 257 | }; |
258 | 258 | ||
259 | /* | 259 | /* |
@@ -310,7 +310,7 @@ static struct attribute *args_attrs[] = { | |||
310 | &args_attr_suiddir.attr, | 310 | &args_attr_suiddir.attr, |
311 | &args_attr_data.attr, | 311 | &args_attr_data.attr, |
312 | &args_attr_noatime.attr, | 312 | &args_attr_noatime.attr, |
313 | NULL | 313 | NULL, |
314 | }; | 314 | }; |
315 | 315 | ||
316 | /* | 316 | /* |
@@ -339,7 +339,7 @@ static struct attribute *counters_attrs[] = { | |||
339 | &counters_attr_glock_held_count.attr, | 339 | &counters_attr_glock_held_count.attr, |
340 | &counters_attr_inode_count.attr, | 340 | &counters_attr_inode_count.attr, |
341 | &counters_attr_reclaimed.attr, | 341 | &counters_attr_reclaimed.attr, |
342 | NULL | 342 | NULL, |
343 | }; | 343 | }; |
344 | 344 | ||
345 | /* | 345 | /* |
@@ -487,27 +487,27 @@ static struct attribute *tune_attrs[] = { | |||
487 | &tune_attr_quota_scale.attr, | 487 | &tune_attr_quota_scale.attr, |
488 | &tune_attr_new_files_jdata.attr, | 488 | &tune_attr_new_files_jdata.attr, |
489 | &tune_attr_new_files_directio.attr, | 489 | &tune_attr_new_files_directio.attr, |
490 | NULL | 490 | NULL, |
491 | }; | 491 | }; |
492 | 492 | ||
493 | static struct attribute_group lockstruct_group = { | 493 | static struct attribute_group lockstruct_group = { |
494 | .name = "lockstruct", | 494 | .name = "lockstruct", |
495 | .attrs = lockstruct_attrs | 495 | .attrs = lockstruct_attrs, |
496 | }; | 496 | }; |
497 | 497 | ||
498 | static struct attribute_group counters_group = { | 498 | static struct attribute_group counters_group = { |
499 | .name = "counters", | 499 | .name = "counters", |
500 | .attrs = counters_attrs | 500 | .attrs = counters_attrs, |
501 | }; | 501 | }; |
502 | 502 | ||
503 | static struct attribute_group args_group = { | 503 | static struct attribute_group args_group = { |
504 | .name = "args", | 504 | .name = "args", |
505 | .attrs = args_attrs | 505 | .attrs = args_attrs, |
506 | }; | 506 | }; |
507 | 507 | ||
508 | static struct attribute_group tune_group = { | 508 | static struct attribute_group tune_group = { |
509 | .name = "tune", | 509 | .name = "tune", |
510 | .attrs = tune_attrs | 510 | .attrs = tune_attrs, |
511 | }; | 511 | }; |
512 | 512 | ||
513 | int gfs2_sys_fs_add(struct gfs2_sbd *sdp) | 513 | int gfs2_sys_fs_add(struct gfs2_sbd *sdp) |