aboutsummaryrefslogtreecommitdiffstats
path: root/fs/reiserfs/inode.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/reiserfs/inode.c')
-rw-r--r--fs/reiserfs/inode.c48
1 files changed, 24 insertions, 24 deletions
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