aboutsummaryrefslogtreecommitdiffstats
path: root/fs/reiserfs
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2014-04-23 10:00:41 -0400
committerJan Kara <jack@suse.cz>2014-05-06 17:18:09 -0400
commitcf776a7a4dafa330dd371a6a301ddf9e38747d93 (patch)
tree838f741515d60b0a32439853e2e11292230b4879 /fs/reiserfs
parent16da167c167529e466235414c9e06cf4726e2058 (diff)
reiserfs: cleanup, remove leading whitespace from labels
This patch moves reiserfs closer to adhering to the style rules by removing leading whitespace from labels. Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/reiserfs')
-rw-r--r--fs/reiserfs/bitmap.c4
-rw-r--r--fs/reiserfs/dir.c2
-rw-r--r--fs/reiserfs/file.c4
-rw-r--r--fs/reiserfs/fix_node.c2
-rw-r--r--fs/reiserfs/inode.c48
-rw-r--r--fs/reiserfs/ioctl.c4
-rw-r--r--fs/reiserfs/journal.c36
-rw-r--r--fs/reiserfs/namei.c14
-rw-r--r--fs/reiserfs/stree.c14
-rw-r--r--fs/reiserfs/xattr.c2
-rw-r--r--fs/reiserfs/xattr_acl.c6
11 files changed, 68 insertions, 68 deletions
diff --git a/fs/reiserfs/bitmap.c b/fs/reiserfs/bitmap.c
index 46359bf3e9e5..543a2a23a293 100644
--- a/fs/reiserfs/bitmap.c
+++ b/fs/reiserfs/bitmap.c
@@ -167,7 +167,7 @@ static int scan_bitmap_block(struct reiserfs_transaction_handle *th,
167 return 0; 167 return 0;
168 168
169 while (1) { 169 while (1) {
170 cont: 170cont:
171 if (bi->free_count < min) { 171 if (bi->free_count < min) {
172 brelse(bh); 172 brelse(bh);
173 return 0; /* No free blocks in this bitmap */ 173 return 0; /* No free blocks in this bitmap */
@@ -409,7 +409,7 @@ static int scan_bitmap(struct reiserfs_transaction_handle *th,
409 nr_allocated = 409 nr_allocated =
410 scan_bitmap_block(th, bm, &off, end_off + 1, min, max, unfm); 410 scan_bitmap_block(th, bm, &off, end_off + 1, min, max, unfm);
411 411
412 ret: 412ret:
413 *start = bm * off_max + off; 413 *start = bm * off_max + off;
414 return nr_allocated; 414 return nr_allocated;
415 415
diff --git a/fs/reiserfs/dir.c b/fs/reiserfs/dir.c
index 57b20efd4c3b..367a47ca4b37 100644
--- a/fs/reiserfs/dir.c
+++ b/fs/reiserfs/dir.c
@@ -89,7 +89,7 @@ int reiserfs_readdir_inode(struct inode *inode, struct dir_context *ctx)
89 89
90 path_to_entry.reada = PATH_READA; 90 path_to_entry.reada = PATH_READA;
91 while (1) { 91 while (1) {
92 research: 92research:
93 /* 93 /*
94 * search the directory item, containing entry with 94 * search the directory item, containing entry with
95 * specified key 95 * specified key
diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c
index 1010c452c450..8496b09f00be 100644
--- a/fs/reiserfs/file.c
+++ b/fs/reiserfs/file.c
@@ -114,7 +114,7 @@ static int reiserfs_file_release(struct inode *inode, struct file *filp)
114 */ 114 */
115 err = reiserfs_truncate_file(inode, 0); 115 err = reiserfs_truncate_file(inode, 0);
116 } 116 }
117 out: 117out:
118 reiserfs_write_unlock(inode->i_sb); 118 reiserfs_write_unlock(inode->i_sb);
119 mutex_unlock(&(REISERFS_I(inode)->tailpack)); 119 mutex_unlock(&(REISERFS_I(inode)->tailpack));
120 return err; 120 return err;
@@ -228,7 +228,7 @@ int reiserfs_commit_page(struct inode *inode, struct page *page,
228 } 228 }
229 if (logit) { 229 if (logit) {
230 ret = journal_end(&th); 230 ret = journal_end(&th);
231 drop_write_lock: 231drop_write_lock:
232 reiserfs_write_unlock(s); 232 reiserfs_write_unlock(s);
233 } 233 }
234 /* 234 /*
diff --git a/fs/reiserfs/fix_node.c b/fs/reiserfs/fix_node.c
index 38163d7b2514..33bbcb68b662 100644
--- a/fs/reiserfs/fix_node.c
+++ b/fs/reiserfs/fix_node.c
@@ -2714,7 +2714,7 @@ int fix_nodes(int op_mode, struct tree_balance *tb,
2714 goto repeat; 2714 goto repeat;
2715 } 2715 }
2716 2716
2717 repeat: 2717repeat:
2718 /* 2718 /*
2719 * fix_nodes was unable to perform its calculation due to 2719 * fix_nodes was unable to perform its calculation due to
2720 * filesystem got changed under us, lack of free disk space or i/o 2720 * filesystem got changed under us, lack of free disk space or i/o
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index ee532c9780a9..c811289a1820 100644
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
@@ -449,7 +449,7 @@ static int _get_block_create_0(struct inode *inode, sector_t block,
449 flush_dcache_page(bh_result->b_page); 449 flush_dcache_page(bh_result->b_page);
450 kunmap(bh_result->b_page); 450 kunmap(bh_result->b_page);
451 451
452 finished: 452finished:
453 pathrelse(&path); 453 pathrelse(&path);
454 454
455 if (result == IO_ERROR) 455 if (result == IO_ERROR)
@@ -558,7 +558,7 @@ static int reiserfs_get_blocks_direct_io(struct inode *inode,
558 if (err < 0) 558 if (err < 0)
559 ret = err; 559 ret = err;
560 } 560 }
561 out: 561out:
562 return ret; 562 return ret;
563} 563}
564 564
@@ -626,12 +626,12 @@ static int convert_tail_for_hole(struct inode *inode,
626 626
627 retval = reiserfs_commit_write(NULL, tail_page, tail_start, tail_end); 627 retval = reiserfs_commit_write(NULL, tail_page, tail_start, tail_end);
628 628
629 unlock: 629unlock:
630 if (tail_page != hole_page) { 630 if (tail_page != hole_page) {
631 unlock_page(tail_page); 631 unlock_page(tail_page);
632 page_cache_release(tail_page); 632 page_cache_release(tail_page);
633 } 633 }
634 out: 634out:
635 return retval; 635 return retval;
636} 636}
637 637
@@ -727,7 +727,7 @@ int reiserfs_get_block(struct inode *inode, sector_t block,
727 /* set the key of the first byte in the 'block'-th block of file */ 727 /* set the key of the first byte in the 'block'-th block of file */
728 make_cpu_key(&key, inode, new_offset, TYPE_ANY, 3 /*key length */ ); 728 make_cpu_key(&key, inode, new_offset, TYPE_ANY, 3 /*key length */ );
729 if ((new_offset + inode->i_sb->s_blocksize - 1) > inode->i_size) { 729 if ((new_offset + inode->i_sb->s_blocksize - 1) > inode->i_size) {
730 start_trans: 730start_trans:
731 th = reiserfs_persistent_transaction(inode->i_sb, jbegin_count); 731 th = reiserfs_persistent_transaction(inode->i_sb, jbegin_count);
732 if (!th) { 732 if (!th) {
733 retval = -ENOMEM; 733 retval = -ENOMEM;
@@ -735,7 +735,7 @@ int reiserfs_get_block(struct inode *inode, sector_t block,
735 } 735 }
736 reiserfs_update_inode_transaction(inode); 736 reiserfs_update_inode_transaction(inode);
737 } 737 }
738 research: 738research:
739 739
740 retval = search_for_position_by_key(inode->i_sb, &key, &path); 740 retval = search_for_position_by_key(inode->i_sb, &key, &path);
741 if (retval == IO_ERROR) { 741 if (retval == IO_ERROR) {
@@ -1143,7 +1143,7 @@ int reiserfs_get_block(struct inode *inode, sector_t block,
1143 1143
1144 retval = 0; 1144 retval = 0;
1145 1145
1146 failure: 1146failure:
1147 if (th && (!dangle || (retval && !th->t_trans_id))) { 1147 if (th && (!dangle || (retval && !th->t_trans_id))) {
1148 int err; 1148 int err;
1149 if (th->t_trans_id) 1149 if (th->t_trans_id)
@@ -2137,7 +2137,7 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th,
2137 2137
2138 return 0; 2138 return 0;
2139 2139
2140 out_bad_inode: 2140out_bad_inode:
2141 /* Invalidate the object, nothing was inserted yet */ 2141 /* Invalidate the object, nothing was inserted yet */
2142 INODE_PKEY(inode)->k_objectid = 0; 2142 INODE_PKEY(inode)->k_objectid = 0;
2143 2143
@@ -2146,7 +2146,7 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th,
2146 dquot_free_inode(inode); 2146 dquot_free_inode(inode);
2147 reiserfs_write_lock_nested(inode->i_sb, depth); 2147 reiserfs_write_lock_nested(inode->i_sb, depth);
2148 2148
2149 out_end_trans: 2149out_end_trans:
2150 journal_end(th); 2150 journal_end(th);
2151 /* 2151 /*
2152 * Drop can be outside and it needs more credits so it's better 2152 * Drop can be outside and it needs more credits so it's better
@@ -2158,7 +2158,7 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th,
2158 inode->i_flags |= S_NOQUOTA; 2158 inode->i_flags |= S_NOQUOTA;
2159 make_bad_inode(inode); 2159 make_bad_inode(inode);
2160 2160
2161 out_inserted_sd: 2161out_inserted_sd:
2162 clear_nlink(inode); 2162 clear_nlink(inode);
2163 th->t_trans_id = 0; /* so the caller can't use this handle later */ 2163 th->t_trans_id = 0; /* so the caller can't use this handle later */
2164 unlock_new_inode(inode); /* OK to do even if we hadn't locked it */ 2164 unlock_new_inode(inode); /* OK to do even if we hadn't locked it */
@@ -2245,10 +2245,10 @@ static int grab_tail_page(struct inode *inode,
2245 *bh_result = bh; 2245 *bh_result = bh;
2246 *page_result = page; 2246 *page_result = page;
2247 2247
2248 out: 2248out:
2249 return error; 2249 return error;
2250 2250
2251 unlock: 2251unlock:
2252 unlock_page(page); 2252 unlock_page(page);
2253 page_cache_release(page); 2253 page_cache_release(page);
2254 return error; 2254 return error;
@@ -2350,7 +2350,7 @@ int reiserfs_truncate_file(struct inode *inode, int update_timestamps)
2350 reiserfs_write_unlock(inode->i_sb); 2350 reiserfs_write_unlock(inode->i_sb);
2351 2351
2352 return 0; 2352 return 0;
2353 out: 2353out:
2354 if (page) { 2354 if (page) {
2355 unlock_page(page); 2355 unlock_page(page);
2356 page_cache_release(page); 2356 page_cache_release(page);
@@ -2393,11 +2393,11 @@ static int map_block_for_writepage(struct inode *inode,
2393 } 2393 }
2394 2394
2395 kmap(bh_result->b_page); 2395 kmap(bh_result->b_page);
2396 start_over: 2396start_over:
2397 reiserfs_write_lock(inode->i_sb); 2397 reiserfs_write_lock(inode->i_sb);
2398 make_cpu_key(&key, inode, byte_offset, TYPE_ANY, 3); 2398 make_cpu_key(&key, inode, byte_offset, TYPE_ANY, 3);
2399 2399
2400 research: 2400research:
2401 retval = search_for_position_by_key(inode->i_sb, &key, &path); 2401 retval = search_for_position_by_key(inode->i_sb, &key, &path);
2402 if (retval != POSITION_FOUND) { 2402 if (retval != POSITION_FOUND) {
2403 use_get_block = 1; 2403 use_get_block = 1;
@@ -2477,7 +2477,7 @@ static int map_block_for_writepage(struct inode *inode,
2477 } 2477 }
2478 retval = 0; 2478 retval = 0;
2479 2479
2480 out: 2480out:
2481 pathrelse(&path); 2481 pathrelse(&path);
2482 if (trans_running) { 2482 if (trans_running) {
2483 int err = journal_end(&th); 2483 int err = journal_end(&th);
@@ -2675,7 +2675,7 @@ static int reiserfs_write_full_page(struct page *page,
2675 } while (bh != head); 2675 } while (bh != head);
2676 2676
2677 error = 0; 2677 error = 0;
2678 done: 2678done:
2679 if (nr == 0) { 2679 if (nr == 0) {
2680 /* 2680 /*
2681 * if this page only had a direct item, it is very possible for 2681 * if this page only had a direct item, it is very possible for
@@ -2697,7 +2697,7 @@ static int reiserfs_write_full_page(struct page *page,
2697 } 2697 }
2698 return error; 2698 return error;
2699 2699
2700 fail: 2700fail:
2701 /* 2701 /*
2702 * catches various errors, we need to make sure any valid dirty blocks 2702 * catches various errors, we need to make sure any valid dirty blocks
2703 * get to the media. The page is currently locked and not marked for 2703 * get to the media. The page is currently locked and not marked for
@@ -2969,7 +2969,7 @@ static int reiserfs_write_end(struct file *file, struct address_space *mapping,
2969 goto out; 2969 goto out;
2970 } 2970 }
2971 2971
2972 out: 2972out:
2973 if (locked) 2973 if (locked)
2974 reiserfs_write_unlock(inode->i_sb); 2974 reiserfs_write_unlock(inode->i_sb);
2975 unlock_page(page); 2975 unlock_page(page);
@@ -2980,7 +2980,7 @@ static int reiserfs_write_end(struct file *file, struct address_space *mapping,
2980 2980
2981 return ret == 0 ? copied : ret; 2981 return ret == 0 ? copied : ret;
2982 2982
2983 journal_error: 2983journal_error:
2984 reiserfs_write_unlock(inode->i_sb); 2984 reiserfs_write_unlock(inode->i_sb);
2985 locked = false; 2985 locked = false;
2986 if (th) { 2986 if (th) {
@@ -3054,10 +3054,10 @@ int reiserfs_commit_write(struct file *f, struct page *page,
3054 goto out; 3054 goto out;
3055 } 3055 }
3056 3056
3057 out: 3057out:
3058 return ret; 3058 return ret;
3059 3059
3060 journal_error: 3060journal_error:
3061 if (th) { 3061 if (th) {
3062 if (!update_sd) 3062 if (!update_sd)
3063 reiserfs_update_sd(th, inode); 3063 reiserfs_update_sd(th, inode);
@@ -3163,7 +3163,7 @@ static int invalidatepage_can_drop(struct inode *inode, struct buffer_head *bh)
3163 && jl != SB_JOURNAL(inode->i_sb)->j_current_jl) 3163 && jl != SB_JOURNAL(inode->i_sb)->j_current_jl)
3164 ret = 0; 3164 ret = 0;
3165 } 3165 }
3166 free_jh: 3166free_jh:
3167 if (ret && bh->b_private) { 3167 if (ret && bh->b_private) {
3168 reiserfs_free_jh(bh); 3168 reiserfs_free_jh(bh);
3169 } 3169 }
@@ -3222,7 +3222,7 @@ static void reiserfs_invalidatepage(struct page *page, unsigned int offset,
3222 ret = try_to_release_page(page, 0); 3222 ret = try_to_release_page(page, 0);
3223 /* maybe should BUG_ON(!ret); - neilb */ 3223 /* maybe should BUG_ON(!ret); - neilb */
3224 } 3224 }
3225 out: 3225out:
3226 return; 3226 return;
3227} 3227}
3228 3228
diff --git a/fs/reiserfs/ioctl.c b/fs/reiserfs/ioctl.c
index a4197c3240b9..501ed6811a2b 100644
--- a/fs/reiserfs/ioctl.c
+++ b/fs/reiserfs/ioctl.c
@@ -219,11 +219,11 @@ int reiserfs_unpack(struct inode *inode, struct file *filp)
219 retval = reiserfs_commit_write(NULL, page, write_from, write_from); 219 retval = reiserfs_commit_write(NULL, page, write_from, write_from);
220 REISERFS_I(inode)->i_flags |= i_nopack_mask; 220 REISERFS_I(inode)->i_flags |= i_nopack_mask;
221 221
222 out_unlock: 222out_unlock:
223 unlock_page(page); 223 unlock_page(page);
224 page_cache_release(page); 224 page_cache_release(page);
225 225
226 out: 226out:
227 mutex_unlock(&inode->i_mutex); 227 mutex_unlock(&inode->i_mutex);
228 reiserfs_write_unlock(inode->i_sb); 228 reiserfs_write_unlock(inode->i_sb);
229 return retval; 229 return retval;
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
index b0ceee401a26..75b0285dc27a 100644
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
@@ -160,7 +160,7 @@ static struct reiserfs_bitmap_node *get_bitmap_node(struct super_block *sb)
160 struct list_head *entry = journal->j_bitmap_nodes.next; 160 struct list_head *entry = journal->j_bitmap_nodes.next;
161 161
162 journal->j_used_bitmap_nodes++; 162 journal->j_used_bitmap_nodes++;
163 repeat: 163repeat:
164 164
165 if (entry != &journal->j_bitmap_nodes) { 165 if (entry != &journal->j_bitmap_nodes) {
166 bn = list_entry(entry, struct reiserfs_bitmap_node, list); 166 bn = list_entry(entry, struct reiserfs_bitmap_node, list);
@@ -757,7 +757,7 @@ static inline int __add_jh(struct reiserfs_journal *j, struct buffer_head *bh,
757 jh = bh->b_private; 757 jh = bh->b_private;
758 list_del_init(&jh->list); 758 list_del_init(&jh->list);
759 } else { 759 } else {
760 no_jh: 760no_jh:
761 get_bh(bh); 761 get_bh(bh);
762 jh = alloc_jh(); 762 jh = alloc_jh();
763 spin_lock(&j->j_dirty_buffers_lock); 763 spin_lock(&j->j_dirty_buffers_lock);
@@ -836,7 +836,7 @@ static int write_ordered_buffers(spinlock_t * lock,
836 reiserfs_free_jh(bh); 836 reiserfs_free_jh(bh);
837 unlock_buffer(bh); 837 unlock_buffer(bh);
838 } 838 }
839 loop_next: 839loop_next:
840 put_bh(bh); 840 put_bh(bh);
841 cond_resched_lock(lock); 841 cond_resched_lock(lock);
842 } 842 }
@@ -891,7 +891,7 @@ static int flush_older_commits(struct super_block *s,
891 unsigned int other_trans_id; 891 unsigned int other_trans_id;
892 unsigned int first_trans_id; 892 unsigned int first_trans_id;
893 893
894 find_first: 894find_first:
895 /* 895 /*
896 * first we walk backwards to find the oldest uncommitted transation 896 * first we walk backwards to find the oldest uncommitted transation
897 */ 897 */
@@ -1153,7 +1153,7 @@ static int flush_commit_list(struct super_block *s,
1153 atomic_set(&(jl->j_older_commits_done), 1); 1153 atomic_set(&(jl->j_older_commits_done), 1);
1154 } 1154 }
1155 mutex_unlock(&jl->j_commit_mutex); 1155 mutex_unlock(&jl->j_commit_mutex);
1156 put_jl: 1156put_jl:
1157 put_journal_list(s, jl); 1157 put_journal_list(s, jl);
1158 1158
1159 if (retval) 1159 if (retval)
@@ -1306,7 +1306,7 @@ static int flush_older_journal_lists(struct super_block *sb,
1306 * we know we are the only ones flushing things, no extra race 1306 * we know we are the only ones flushing things, no extra race
1307 * protection is required. 1307 * protection is required.
1308 */ 1308 */
1309 restart: 1309restart:
1310 entry = journal->j_journal_list.next; 1310 entry = journal->j_journal_list.next;
1311 /* Did we wrap? */ 1311 /* Did we wrap? */
1312 if (entry == &journal->j_journal_list) 1312 if (entry == &journal->j_journal_list)
@@ -1504,7 +1504,7 @@ static int flush_journal_list(struct super_block *s,
1504 (unsigned long long)saved_bh-> 1504 (unsigned long long)saved_bh->
1505 b_blocknr, __func__); 1505 b_blocknr, __func__);
1506 } 1506 }
1507 free_cnode: 1507free_cnode:
1508 last = cn; 1508 last = cn;
1509 cn = cn->next; 1509 cn = cn->next;
1510 if (saved_bh) { 1510 if (saved_bh) {
@@ -1564,7 +1564,7 @@ static int flush_journal_list(struct super_block *s,
1564 reiserfs_abort(s, -EIO, 1564 reiserfs_abort(s, -EIO,
1565 "Write error while pushing transaction to disk in %s", 1565 "Write error while pushing transaction to disk in %s",
1566 __func__); 1566 __func__);
1567 flush_older_and_return: 1567flush_older_and_return:
1568 1568
1569 /* 1569 /*
1570 * before we can update the journal header block, we _must_ flush all 1570 * before we can update the journal header block, we _must_ flush all
@@ -1670,7 +1670,7 @@ static int write_one_transaction(struct super_block *s,
1670 } 1670 }
1671 put_bh(tmp_bh); 1671 put_bh(tmp_bh);
1672 } 1672 }
1673 next: 1673next:
1674 cn = cn->next; 1674 cn = cn->next;
1675 cond_resched(); 1675 cond_resched();
1676 } 1676 }
@@ -1770,7 +1770,7 @@ static int kupdate_transactions(struct super_block *s,
1770 write_chunk(&chunk); 1770 write_chunk(&chunk);
1771 } 1771 }
1772 1772
1773 done: 1773done:
1774 mutex_unlock(&journal->j_flush_mutex); 1774 mutex_unlock(&journal->j_flush_mutex);
1775 return ret; 1775 return ret;
1776} 1776}
@@ -2229,7 +2229,7 @@ static int journal_read_transaction(struct super_block *sb,
2229 reiserfs_warning(sb, "journal-1204", 2229 reiserfs_warning(sb, "journal-1204",
2230 "REPLAY FAILURE fsck required! " 2230 "REPLAY FAILURE fsck required! "
2231 "Trying to replay onto a log block"); 2231 "Trying to replay onto a log block");
2232 abort_replay: 2232abort_replay:
2233 brelse_array(log_blocks, i); 2233 brelse_array(log_blocks, i);
2234 brelse_array(real_blocks, i); 2234 brelse_array(real_blocks, i);
2235 brelse(c_bh); 2235 brelse(c_bh);
@@ -2491,7 +2491,7 @@ static int journal_read(struct super_block *sb)
2491 brelse(d_bh); 2491 brelse(d_bh);
2492 } 2492 }
2493 2493
2494 start_log_replay: 2494start_log_replay:
2495 cur_dblock = oldest_start; 2495 cur_dblock = oldest_start;
2496 if (oldest_trans_id) { 2496 if (oldest_trans_id) {
2497 reiserfs_debug(sb, REISERFS_DEBUG_CODE, 2497 reiserfs_debug(sb, REISERFS_DEBUG_CODE,
@@ -2892,7 +2892,7 @@ int journal_init(struct super_block *sb, const char *j_dev_name,
2892 INIT_DELAYED_WORK(&journal->j_work, flush_async_commits); 2892 INIT_DELAYED_WORK(&journal->j_work, flush_async_commits);
2893 journal->j_work_sb = sb; 2893 journal->j_work_sb = sb;
2894 return 0; 2894 return 0;
2895 free_and_return: 2895free_and_return:
2896 free_journal_ram(sb); 2896 free_journal_ram(sb);
2897 return 1; 2897 return 1;
2898} 2898}
@@ -3031,7 +3031,7 @@ static int do_journal_begin_r(struct reiserfs_transaction_handle *th,
3031 th->t_refcount = 1; 3031 th->t_refcount = 1;
3032 th->t_super = sb; 3032 th->t_super = sb;
3033 3033
3034 relock: 3034relock:
3035 lock_journal(sb); 3035 lock_journal(sb);
3036 if (join != JBEGIN_ABORT && reiserfs_is_journal_aborted(journal)) { 3036 if (join != JBEGIN_ABORT && reiserfs_is_journal_aborted(journal)) {
3037 unlock_journal(sb); 3037 unlock_journal(sb);
@@ -3122,7 +3122,7 @@ static int do_journal_begin_r(struct reiserfs_transaction_handle *th,
3122 INIT_LIST_HEAD(&th->t_list); 3122 INIT_LIST_HEAD(&th->t_list);
3123 return 0; 3123 return 0;
3124 3124
3125 out_fail: 3125out_fail:
3126 memset(th, 0, sizeof(*th)); 3126 memset(th, 0, sizeof(*th));
3127 /* 3127 /*
3128 * Re-set th->t_super, so we can properly keep track of how many 3128 * Re-set th->t_super, so we can properly keep track of how many
@@ -3876,7 +3876,7 @@ static int __commit_trans_jl(struct inode *inode, unsigned long id,
3876 * the inode still exists. We know the list is still around 3876 * the inode still exists. We know the list is still around
3877 * if we've got a larger transaction id than the oldest list 3877 * if we've got a larger transaction id than the oldest list
3878 */ 3878 */
3879 flush_commit_only: 3879flush_commit_only:
3880 if (journal_list_still_alive(inode->i_sb, id)) { 3880 if (journal_list_still_alive(inode->i_sb, id)) {
3881 /* 3881 /*
3882 * we only set ret to 1 when we know for sure 3882 * we only set ret to 1 when we know for sure
@@ -4302,7 +4302,7 @@ static int do_journal_end(struct reiserfs_transaction_handle *th, int flags)
4302 * transactions that might get overwritten. If any journal lists 4302 * transactions that might get overwritten. If any journal lists
4303 * are very old flush them as well. 4303 * are very old flush them as well.
4304 */ 4304 */
4305 first_jl: 4305first_jl:
4306 list_for_each_safe(entry, safe, &journal->j_journal_list) { 4306 list_for_each_safe(entry, safe, &journal->j_journal_list) {
4307 temp_jl = JOURNAL_LIST_ENTRY(entry); 4307 temp_jl = JOURNAL_LIST_ENTRY(entry);
4308 if (journal->j_start <= temp_jl->j_start) { 4308 if (journal->j_start <= temp_jl->j_start) {
@@ -4359,7 +4359,7 @@ static int do_journal_end(struct reiserfs_transaction_handle *th, int flags)
4359 journal_list_still_alive(sb, commit_trans_id)) { 4359 journal_list_still_alive(sb, commit_trans_id)) {
4360 flush_commit_list(sb, jl, 1); 4360 flush_commit_list(sb, jl, 1);
4361 } 4361 }
4362 out: 4362out:
4363 reiserfs_check_lock_depth(sb, "journal end2"); 4363 reiserfs_check_lock_depth(sb, "journal end2");
4364 4364
4365 memset(th, 0, sizeof(*th)); 4365 memset(th, 0, sizeof(*th));
diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
index b8a873df089d..ebae36db94a0 100644
--- a/fs/reiserfs/namei.c
+++ b/fs/reiserfs/namei.c
@@ -686,7 +686,7 @@ static int reiserfs_create(struct inode *dir, struct dentry *dentry, umode_t mod
686 d_instantiate(dentry, inode); 686 d_instantiate(dentry, inode);
687 retval = journal_end(&th); 687 retval = journal_end(&th);
688 688
689 out_failed: 689out_failed:
690 reiserfs_write_unlock(dir->i_sb); 690 reiserfs_write_unlock(dir->i_sb);
691 return retval; 691 return retval;
692} 692}
@@ -767,7 +767,7 @@ static int reiserfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode
767 d_instantiate(dentry, inode); 767 d_instantiate(dentry, inode);
768 retval = journal_end(&th); 768 retval = journal_end(&th);
769 769
770 out_failed: 770out_failed:
771 reiserfs_write_unlock(dir->i_sb); 771 reiserfs_write_unlock(dir->i_sb);
772 return retval; 772 return retval;
773} 773}
@@ -958,11 +958,11 @@ static int reiserfs_rmdir(struct inode *dir, struct dentry *dentry)
958 958
959 retval = journal_end(&th); 959 retval = journal_end(&th);
960 reiserfs_check_path(&path); 960 reiserfs_check_path(&path);
961 out_rmdir: 961out_rmdir:
962 reiserfs_write_unlock(dir->i_sb); 962 reiserfs_write_unlock(dir->i_sb);
963 return retval; 963 return retval;
964 964
965 end_rmdir: 965end_rmdir:
966 /* 966 /*
967 * we must release path, because we did not call 967 * we must release path, because we did not call
968 * reiserfs_cut_from_item, or reiserfs_cut_from_item does not 968 * reiserfs_cut_from_item, or reiserfs_cut_from_item does not
@@ -1064,13 +1064,13 @@ static int reiserfs_unlink(struct inode *dir, struct dentry *dentry)
1064 reiserfs_write_unlock(dir->i_sb); 1064 reiserfs_write_unlock(dir->i_sb);
1065 return retval; 1065 return retval;
1066 1066
1067 end_unlink: 1067end_unlink:
1068 pathrelse(&path); 1068 pathrelse(&path);
1069 err = journal_end(&th); 1069 err = journal_end(&th);
1070 reiserfs_check_path(&path); 1070 reiserfs_check_path(&path);
1071 if (err) 1071 if (err)
1072 retval = err; 1072 retval = err;
1073 out_unlink: 1073out_unlink:
1074 reiserfs_write_unlock(dir->i_sb); 1074 reiserfs_write_unlock(dir->i_sb);
1075 return retval; 1075 return retval;
1076} 1076}
@@ -1164,7 +1164,7 @@ static int reiserfs_symlink(struct inode *parent_dir,
1164 unlock_new_inode(inode); 1164 unlock_new_inode(inode);
1165 d_instantiate(dentry, inode); 1165 d_instantiate(dentry, inode);
1166 retval = journal_end(&th); 1166 retval = journal_end(&th);
1167 out_failed: 1167out_failed:
1168 reiserfs_write_unlock(parent_dir->i_sb); 1168 reiserfs_write_unlock(parent_dir->i_sb);
1169 return retval; 1169 return retval;
1170} 1170}
diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
index 6d697d7328a0..ebfebc5b7dd6 100644
--- a/fs/reiserfs/stree.c
+++ b/fs/reiserfs/stree.c
@@ -668,7 +668,7 @@ int search_by_key(struct super_block *sb, const struct cpu_key *key,
668 if (!buffer_uptodate(bh)) 668 if (!buffer_uptodate(bh))
669 goto io_error; 669 goto io_error;
670 } else { 670 } else {
671 io_error: 671io_error:
672 search_path->path_length--; 672 search_path->path_length--;
673 pathrelse(search_path); 673 pathrelse(search_path);
674 return IO_ERROR; 674 return IO_ERROR;
@@ -2010,7 +2010,7 @@ int reiserfs_do_truncate(struct reiserfs_transaction_handle *th,
2010 "PAP-5680: truncate did not finish: new_file_size %Ld, current %Ld, oid %d", 2010 "PAP-5680: truncate did not finish: new_file_size %Ld, current %Ld, oid %d",
2011 new_file_size, file_size, s_item_key.on_disk_key.k_objectid); 2011 new_file_size, file_size, s_item_key.on_disk_key.k_objectid);
2012 2012
2013 update_and_out: 2013update_and_out:
2014 if (update_timestamps) { 2014 if (update_timestamps) {
2015 /* this is truncate, not file closing */ 2015 /* this is truncate, not file closing */
2016 inode->i_mtime = CURRENT_TIME_SEC; 2016 inode->i_mtime = CURRENT_TIME_SEC;
@@ -2018,7 +2018,7 @@ int reiserfs_do_truncate(struct reiserfs_transaction_handle *th,
2018 } 2018 }
2019 reiserfs_update_sd(th, inode); 2019 reiserfs_update_sd(th, inode);
2020 2020
2021 out: 2021out:
2022 pathrelse(&s_search_path); 2022 pathrelse(&s_search_path);
2023 return err; 2023 return err;
2024} 2024}
@@ -2112,7 +2112,7 @@ int reiserfs_paste_into_item(struct reiserfs_transaction_handle *th,
2112 while ((retval = 2112 while ((retval =
2113 fix_nodes(M_PASTE, &s_paste_balance, NULL, 2113 fix_nodes(M_PASTE, &s_paste_balance, NULL,
2114 body)) == REPEAT_SEARCH) { 2114 body)) == REPEAT_SEARCH) {
2115 search_again: 2115search_again:
2116 /* file system changed while we were in the fix_nodes */ 2116 /* file system changed while we were in the fix_nodes */
2117 PROC_INFO_INC(th->t_super, paste_into_item_restarted); 2117 PROC_INFO_INC(th->t_super, paste_into_item_restarted);
2118 retval = 2118 retval =
@@ -2143,7 +2143,7 @@ int reiserfs_paste_into_item(struct reiserfs_transaction_handle *th,
2143 return 0; 2143 return 0;
2144 } 2144 }
2145 retval = (retval == NO_DISK_SPACE) ? -ENOSPC : -EIO; 2145 retval = (retval == NO_DISK_SPACE) ? -ENOSPC : -EIO;
2146 error_out: 2146error_out:
2147 /* this also releases the path */ 2147 /* this also releases the path */
2148 unfix_nodes(&s_paste_balance); 2148 unfix_nodes(&s_paste_balance);
2149#ifdef REISERQUOTA_DEBUG 2149#ifdef REISERQUOTA_DEBUG
@@ -2222,7 +2222,7 @@ int reiserfs_insert_item(struct reiserfs_transaction_handle *th,
2222 while ((retval = 2222 while ((retval =
2223 fix_nodes(M_INSERT, &s_ins_balance, ih, 2223 fix_nodes(M_INSERT, &s_ins_balance, ih,
2224 body)) == REPEAT_SEARCH) { 2224 body)) == REPEAT_SEARCH) {
2225 search_again: 2225search_again:
2226 /* file system changed while we were in the fix_nodes */ 2226 /* file system changed while we were in the fix_nodes */
2227 PROC_INFO_INC(th->t_super, insert_item_restarted); 2227 PROC_INFO_INC(th->t_super, insert_item_restarted);
2228 retval = search_item(th->t_super, key, path); 2228 retval = search_item(th->t_super, key, path);
@@ -2246,7 +2246,7 @@ int reiserfs_insert_item(struct reiserfs_transaction_handle *th,
2246 } 2246 }
2247 2247
2248 retval = (retval == NO_DISK_SPACE) ? -ENOSPC : -EIO; 2248 retval = (retval == NO_DISK_SPACE) ? -ENOSPC : -EIO;
2249 error_out: 2249error_out:
2250 /* also releases the path */ 2250 /* also releases the path */
2251 unfix_nodes(&s_ins_balance); 2251 unfix_nodes(&s_ins_balance);
2252#ifdef REISERQUOTA_DEBUG 2252#ifdef REISERQUOTA_DEBUG
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c
index a827d0b1cdb8..66a380c2ad39 100644
--- a/fs/reiserfs/xattr.c
+++ b/fs/reiserfs/xattr.c
@@ -423,7 +423,7 @@ static struct page *reiserfs_get_page(struct inode *dir, size_t n)
423 } 423 }
424 return page; 424 return page;
425 425
426 fail: 426fail:
427 reiserfs_put_page(page); 427 reiserfs_put_page(page);
428 return ERR_PTR(-EIO); 428 return ERR_PTR(-EIO);
429} 429}
diff --git a/fs/reiserfs/xattr_acl.c b/fs/reiserfs/xattr_acl.c
index 8d9f22c72429..44503e293790 100644
--- a/fs/reiserfs/xattr_acl.c
+++ b/fs/reiserfs/xattr_acl.c
@@ -113,7 +113,7 @@ static struct posix_acl *reiserfs_posix_acl_from_disk(const void *value, size_t
113 goto fail; 113 goto fail;
114 return acl; 114 return acl;
115 115
116 fail: 116fail:
117 posix_acl_release(acl); 117 posix_acl_release(acl);
118 return ERR_PTR(-EINVAL); 118 return ERR_PTR(-EINVAL);
119} 119}
@@ -166,7 +166,7 @@ static void *reiserfs_posix_acl_to_disk(const struct posix_acl *acl, size_t * si
166 } 166 }
167 return (char *)ext_acl; 167 return (char *)ext_acl;
168 168
169 fail: 169fail:
170 kfree(ext_acl); 170 kfree(ext_acl);
171 return ERR_PTR(-EINVAL); 171 return ERR_PTR(-EINVAL);
172} 172}
@@ -345,7 +345,7 @@ reiserfs_inherit_default_acl(struct reiserfs_transaction_handle *th,
345 345
346 return err; 346 return err;
347 347
348 apply_umask: 348apply_umask:
349 /* no ACL, apply umask */ 349 /* no ACL, apply umask */
350 inode->i_mode &= ~current_umask(); 350 inode->i_mode &= ~current_umask();
351 return err; 351 return err;