diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-04 12:04:26 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-04 12:04:26 -0400 |
commit | a91ea69ffd3f8a0b7139bfd44042ab384461e631 (patch) | |
tree | f05952e49e01609b21dbe8d27d9ffd30b4aa507f /fs/gfs2/super.c | |
parent | 75d3b817a0b48425da921052955cc58f20bbab52 (diff) |
[GFS2] Align all labels against LH side
This makes everything consistent.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/super.c')
-rw-r--r-- | fs/gfs2/super.c | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index e93066f930c1..520266c2044b 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c | |||
@@ -535,7 +535,7 @@ int gfs2_make_fs_rw(struct gfs2_sbd *sdp) | |||
535 | 535 | ||
536 | error = gfs2_quota_init(sdp); | 536 | error = gfs2_quota_init(sdp); |
537 | if (error) | 537 | if (error) |
538 | goto fail_unlinked; | 538 | goto fail; |
539 | 539 | ||
540 | set_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags); | 540 | set_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags); |
541 | 541 | ||
@@ -543,9 +543,7 @@ int gfs2_make_fs_rw(struct gfs2_sbd *sdp) | |||
543 | 543 | ||
544 | return 0; | 544 | return 0; |
545 | 545 | ||
546 | fail_unlinked: | 546 | fail: |
547 | |||
548 | fail: | ||
549 | t_gh.gh_flags |= GL_NOCACHE; | 547 | t_gh.gh_flags |= GL_NOCACHE; |
550 | gfs2_glock_dq_uninit(&t_gh); | 548 | gfs2_glock_dq_uninit(&t_gh); |
551 | 549 | ||
@@ -625,12 +623,10 @@ int gfs2_statfs_init(struct gfs2_sbd *sdp) | |||
625 | brelse(l_bh); | 623 | brelse(l_bh); |
626 | } | 624 | } |
627 | 625 | ||
628 | out_m_bh: | 626 | out_m_bh: |
629 | brelse(m_bh); | 627 | brelse(m_bh); |
630 | 628 | out: | |
631 | out: | ||
632 | gfs2_glock_dq_uninit(&gh); | 629 | gfs2_glock_dq_uninit(&gh); |
633 | |||
634 | return 0; | 630 | return 0; |
635 | } | 631 | } |
636 | 632 | ||
@@ -715,15 +711,12 @@ int gfs2_statfs_sync(struct gfs2_sbd *sdp) | |||
715 | 711 | ||
716 | gfs2_trans_end(sdp); | 712 | gfs2_trans_end(sdp); |
717 | 713 | ||
718 | out_bh2: | 714 | out_bh2: |
719 | brelse(l_bh); | 715 | brelse(l_bh); |
720 | 716 | out_bh: | |
721 | out_bh: | ||
722 | brelse(m_bh); | 717 | brelse(m_bh); |
723 | 718 | out: | |
724 | out: | ||
725 | gfs2_glock_dq_uninit(&gh); | 719 | gfs2_glock_dq_uninit(&gh); |
726 | |||
727 | return error; | 720 | return error; |
728 | } | 721 | } |
729 | 722 | ||
@@ -853,9 +846,8 @@ int gfs2_statfs_slow(struct gfs2_sbd *sdp, struct gfs2_statfs_change *sc) | |||
853 | 846 | ||
854 | gfs2_glock_dq_uninit(&ri_gh); | 847 | gfs2_glock_dq_uninit(&ri_gh); |
855 | 848 | ||
856 | out: | 849 | out: |
857 | kfree(gha); | 850 | kfree(gha); |
858 | |||
859 | return error; | 851 | return error; |
860 | } | 852 | } |
861 | 853 | ||
@@ -924,7 +916,7 @@ static int gfs2_lock_fs_check_clean(struct gfs2_sbd *sdp, | |||
924 | if (error) | 916 | if (error) |
925 | gfs2_glock_dq_uninit(t_gh); | 917 | gfs2_glock_dq_uninit(t_gh); |
926 | 918 | ||
927 | out: | 919 | out: |
928 | while (!list_empty(&list)) { | 920 | while (!list_empty(&list)) { |
929 | lfcc = list_entry(list.next, struct lfcc, list); | 921 | lfcc = list_entry(list.next, struct lfcc, list); |
930 | list_del(&lfcc->list); | 922 | list_del(&lfcc->list); |
@@ -932,7 +924,6 @@ static int gfs2_lock_fs_check_clean(struct gfs2_sbd *sdp, | |||
932 | kfree(lfcc); | 924 | kfree(lfcc); |
933 | } | 925 | } |
934 | gfs2_glock_dq_uninit(&ji_gh); | 926 | gfs2_glock_dq_uninit(&ji_gh); |
935 | |||
936 | return error; | 927 | return error; |
937 | } | 928 | } |
938 | 929 | ||