aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ufs/balloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ufs/balloc.c')
-rw-r--r--fs/ufs/balloc.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/fs/ufs/balloc.c b/fs/ufs/balloc.c
index a7ea492ae660..0ab1de4b39a5 100644
--- a/fs/ufs/balloc.c
+++ b/fs/ufs/balloc.c
@@ -38,7 +38,6 @@ void ufs_free_fragments(struct inode *inode, u64 fragment, unsigned count)
38{ 38{
39 struct super_block * sb; 39 struct super_block * sb;
40 struct ufs_sb_private_info * uspi; 40 struct ufs_sb_private_info * uspi;
41 struct ufs_super_block_first * usb1;
42 struct ufs_cg_private_info * ucpi; 41 struct ufs_cg_private_info * ucpi;
43 struct ufs_cylinder_group * ucg; 42 struct ufs_cylinder_group * ucg;
44 unsigned cgno, bit, end_bit, bbase, blkmap, i; 43 unsigned cgno, bit, end_bit, bbase, blkmap, i;
@@ -46,7 +45,6 @@ void ufs_free_fragments(struct inode *inode, u64 fragment, unsigned count)
46 45
47 sb = inode->i_sb; 46 sb = inode->i_sb;
48 uspi = UFS_SB(sb)->s_uspi; 47 uspi = UFS_SB(sb)->s_uspi;
49 usb1 = ubh_get_usb_first(uspi);
50 48
51 UFSD("ENTER, fragment %llu, count %u\n", 49 UFSD("ENTER, fragment %llu, count %u\n",
52 (unsigned long long)fragment, count); 50 (unsigned long long)fragment, count);
@@ -135,7 +133,6 @@ void ufs_free_blocks(struct inode *inode, u64 fragment, unsigned count)
135{ 133{
136 struct super_block * sb; 134 struct super_block * sb;
137 struct ufs_sb_private_info * uspi; 135 struct ufs_sb_private_info * uspi;
138 struct ufs_super_block_first * usb1;
139 struct ufs_cg_private_info * ucpi; 136 struct ufs_cg_private_info * ucpi;
140 struct ufs_cylinder_group * ucg; 137 struct ufs_cylinder_group * ucg;
141 unsigned overflow, cgno, bit, end_bit, i; 138 unsigned overflow, cgno, bit, end_bit, i;
@@ -143,7 +140,6 @@ void ufs_free_blocks(struct inode *inode, u64 fragment, unsigned count)
143 140
144 sb = inode->i_sb; 141 sb = inode->i_sb;
145 uspi = UFS_SB(sb)->s_uspi; 142 uspi = UFS_SB(sb)->s_uspi;
146 usb1 = ubh_get_usb_first(uspi);
147 143
148 UFSD("ENTER, fragment %llu, count %u\n", 144 UFSD("ENTER, fragment %llu, count %u\n",
149 (unsigned long long)fragment, count); 145 (unsigned long long)fragment, count);
@@ -499,7 +495,6 @@ static u64 ufs_add_fragments(struct inode *inode, u64 fragment,
499{ 495{
500 struct super_block * sb; 496 struct super_block * sb;
501 struct ufs_sb_private_info * uspi; 497 struct ufs_sb_private_info * uspi;
502 struct ufs_super_block_first * usb1;
503 struct ufs_cg_private_info * ucpi; 498 struct ufs_cg_private_info * ucpi;
504 struct ufs_cylinder_group * ucg; 499 struct ufs_cylinder_group * ucg;
505 unsigned cgno, fragno, fragoff, count, fragsize, i; 500 unsigned cgno, fragno, fragoff, count, fragsize, i;
@@ -509,7 +504,6 @@ static u64 ufs_add_fragments(struct inode *inode, u64 fragment,
509 504
510 sb = inode->i_sb; 505 sb = inode->i_sb;
511 uspi = UFS_SB(sb)->s_uspi; 506 uspi = UFS_SB(sb)->s_uspi;
512 usb1 = ubh_get_usb_first (uspi);
513 count = newcount - oldcount; 507 count = newcount - oldcount;
514 508
515 cgno = ufs_dtog(uspi, fragment); 509 cgno = ufs_dtog(uspi, fragment);
@@ -577,7 +571,6 @@ static u64 ufs_alloc_fragments(struct inode *inode, unsigned cgno,
577{ 571{
578 struct super_block * sb; 572 struct super_block * sb;
579 struct ufs_sb_private_info * uspi; 573 struct ufs_sb_private_info * uspi;
580 struct ufs_super_block_first * usb1;
581 struct ufs_cg_private_info * ucpi; 574 struct ufs_cg_private_info * ucpi;
582 struct ufs_cylinder_group * ucg; 575 struct ufs_cylinder_group * ucg;
583 unsigned oldcg, i, j, k, allocsize; 576 unsigned oldcg, i, j, k, allocsize;
@@ -588,7 +581,6 @@ static u64 ufs_alloc_fragments(struct inode *inode, unsigned cgno,
588 581
589 sb = inode->i_sb; 582 sb = inode->i_sb;
590 uspi = UFS_SB(sb)->s_uspi; 583 uspi = UFS_SB(sb)->s_uspi;
591 usb1 = ubh_get_usb_first(uspi);
592 oldcg = cgno; 584 oldcg = cgno;
593 585
594 /* 586 /*
@@ -690,7 +682,6 @@ static u64 ufs_alloccg_block(struct inode *inode,
690{ 682{
691 struct super_block * sb; 683 struct super_block * sb;
692 struct ufs_sb_private_info * uspi; 684 struct ufs_sb_private_info * uspi;
693 struct ufs_super_block_first * usb1;
694 struct ufs_cylinder_group * ucg; 685 struct ufs_cylinder_group * ucg;
695 u64 result, blkno; 686 u64 result, blkno;
696 687
@@ -698,7 +689,6 @@ static u64 ufs_alloccg_block(struct inode *inode,
698 689
699 sb = inode->i_sb; 690 sb = inode->i_sb;
700 uspi = UFS_SB(sb)->s_uspi; 691 uspi = UFS_SB(sb)->s_uspi;
701 usb1 = ubh_get_usb_first(uspi);
702 ucg = ubh_get_ucg(UCPI_UBH(ucpi)); 692 ucg = ubh_get_ucg(UCPI_UBH(ucpi));
703 693
704 if (goal == 0) { 694 if (goal == 0) {
@@ -794,7 +784,6 @@ static u64 ufs_bitmap_search(struct super_block *sb,
794 0x0, 0x2, 0x6, 0xe, 0x1e, 0x3e, 0x7e, 0xfe, 0x1fe 784 0x0, 0x2, 0x6, 0xe, 0x1e, 0x3e, 0x7e, 0xfe, 0x1fe
795 }; 785 };
796 struct ufs_sb_private_info *uspi = UFS_SB(sb)->s_uspi; 786 struct ufs_sb_private_info *uspi = UFS_SB(sb)->s_uspi;
797 struct ufs_super_block_first *usb1;
798 struct ufs_cylinder_group *ucg; 787 struct ufs_cylinder_group *ucg;
799 unsigned start, length, loc; 788 unsigned start, length, loc;
800 unsigned pos, want, blockmap, mask, end; 789 unsigned pos, want, blockmap, mask, end;
@@ -803,7 +792,6 @@ static u64 ufs_bitmap_search(struct super_block *sb,
803 UFSD("ENTER, cg %u, goal %llu, count %u\n", ucpi->c_cgx, 792 UFSD("ENTER, cg %u, goal %llu, count %u\n", ucpi->c_cgx,
804 (unsigned long long)goal, count); 793 (unsigned long long)goal, count);
805 794
806 usb1 = ubh_get_usb_first (uspi);
807 ucg = ubh_get_ucg(UCPI_UBH(ucpi)); 795 ucg = ubh_get_ucg(UCPI_UBH(ucpi));
808 796
809 if (goal) 797 if (goal)