Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fs/reiserfs/bitmap.c: coding style fixes

-Trivial code clean-up
-Fix endif }; (coccinelle warning)

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Fabian Frederick and committed by
Linus Torvalds
ae0a50ab b951242a

+6 -7
+6 -7
fs/reiserfs/bitmap.c
··· 142 142 int org = *beg; 143 143 144 144 BUG_ON(!th->t_trans_id); 145 - 146 145 RFALSE(bmap_n >= reiserfs_bmap_count(s), "Bitmap %u is out of " 147 146 "range (0..%u)", bmap_n, reiserfs_bmap_count(s) - 1); 148 147 PROC_INFO_INC(s, scan_bitmap.bmap); ··· 320 321 unsigned int off_max = s->s_blocksize << 3; 321 322 322 323 BUG_ON(!th->t_trans_id); 323 - 324 324 PROC_INFO_INC(s, scan_bitmap.call); 325 325 if (SB_FREE_BLOCKS(s) <= 0) 326 326 return 0; // No point in looking for more free blocks ··· 386 388 unsigned int nr, offset; 387 389 388 390 BUG_ON(!th->t_trans_id); 389 - 390 391 PROC_INFO_INC(s, free_block); 391 - 392 392 rs = SB_DISK_SUPER_BLOCK(s); 393 393 sbh = SB_BUFFER_WITH_SB(s); 394 394 apbi = SB_AP_BITMAP(s); ··· 431 435 int for_unformatted) 432 436 { 433 437 struct super_block *s = th->t_super; 434 - BUG_ON(!th->t_trans_id); 435 438 439 + BUG_ON(!th->t_trans_id); 436 440 RFALSE(!s, "vs-4061: trying to free block on nonexistent device"); 437 441 if (!is_reusable(s, block, 1)) 438 442 return; ··· 467 471 unsigned long save = ei->i_prealloc_block; 468 472 int dirty = 0; 469 473 struct inode *inode = &ei->vfs_inode; 474 + 470 475 BUG_ON(!th->t_trans_id); 471 476 #ifdef CONFIG_REISERFS_CHECK 472 477 if (ei->i_prealloc_count < 0) ··· 491 494 struct inode *inode) 492 495 { 493 496 struct reiserfs_inode_info *ei = REISERFS_I(inode); 497 + 494 498 BUG_ON(!th->t_trans_id); 495 499 if (ei->i_prealloc_count) 496 500 __discard_prealloc(th, ei); ··· 502 504 struct list_head *plist = &SB_JOURNAL(th->t_super)->j_prealloc_list; 503 505 504 506 BUG_ON(!th->t_trans_id); 505 - 506 507 while (!list_empty(plist)) { 507 508 struct reiserfs_inode_info *ei; 508 509 ei = list_entry(plist->next, struct reiserfs_inode_info, ··· 559 562 if (!strcmp(this_char, "displacing_new_packing_localities")) { 560 563 SET_OPTION(displacing_new_packing_localities); 561 564 continue; 562 - }; 565 + } 563 566 564 567 if (!strcmp(this_char, "old_hashed_relocation")) { 565 568 SET_OPTION(old_hashed_relocation); ··· 726 729 static inline void new_hashed_relocation(reiserfs_blocknr_hint_t * hint) 727 730 { 728 731 char *hash_in; 732 + 729 733 if (hint->formatted_node) { 730 734 hash_in = (char *)&hint->key.k_dir_id; 731 735 } else { ··· 755 757 __u32 dirid = 0; 756 758 int bm = 0; 757 759 struct super_block *sb = hint->th->t_super; 760 + 758 761 if (hint->inode) 759 762 dirid = le32_to_cpu(INODE_PKEY(hint->inode)->k_dir_id); 760 763 else if (hint->formatted_node)