diff options
| author | Christian Engelmayer <cengelma@gmx.at> | 2014-04-07 18:39:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-07 19:36:16 -0400 |
| commit | 6e0bd34c33b193849b5ada01dd0b02d3bef85bf3 (patch) | |
| tree | 123a6f56e078530893c614ad1e09273f02992a00 | |
| parent | 76ee4735781713eed1b9754837715a0b3b231dcd (diff) | |
fs/ufs: remove unused ufs_super_block_first pointer
Remove occurences of unused pointers to struct ufs_super_block_first
that were acquired via ubh_get_usb_first().
Detected by Coverity: CID 139929 - CID 139936, CID 139940.
Signed-off-by: Christian Engelmayer <cengelma@gmx.at>
Cc: Evgeniy Dushistov <dushistov@mail.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/ufs/balloc.c | 12 | ||||
| -rw-r--r-- | fs/ufs/ialloc.c | 4 | ||||
| -rw-r--r-- | fs/ufs/super.c | 2 |
3 files changed, 0 insertions, 18 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) |
diff --git a/fs/ufs/ialloc.c b/fs/ufs/ialloc.c index d0426d74817b..98f7211599ff 100644 --- a/fs/ufs/ialloc.c +++ b/fs/ufs/ialloc.c | |||
| @@ -57,7 +57,6 @@ void ufs_free_inode (struct inode * inode) | |||
| 57 | { | 57 | { |
| 58 | struct super_block * sb; | 58 | struct super_block * sb; |
| 59 | struct ufs_sb_private_info * uspi; | 59 | struct ufs_sb_private_info * uspi; |
| 60 | struct ufs_super_block_first * usb1; | ||
| 61 | struct ufs_cg_private_info * ucpi; | 60 | struct ufs_cg_private_info * ucpi; |
| 62 | struct ufs_cylinder_group * ucg; | 61 | struct ufs_cylinder_group * ucg; |
| 63 | int is_directory; | 62 | int is_directory; |
| @@ -67,7 +66,6 @@ void ufs_free_inode (struct inode * inode) | |||
| 67 | 66 | ||
| 68 | sb = inode->i_sb; | 67 | sb = inode->i_sb; |
| 69 | uspi = UFS_SB(sb)->s_uspi; | 68 | uspi = UFS_SB(sb)->s_uspi; |
| 70 | usb1 = ubh_get_usb_first(uspi); | ||
| 71 | 69 | ||
| 72 | ino = inode->i_ino; | 70 | ino = inode->i_ino; |
| 73 | 71 | ||
| @@ -175,7 +173,6 @@ struct inode *ufs_new_inode(struct inode *dir, umode_t mode) | |||
| 175 | struct super_block * sb; | 173 | struct super_block * sb; |
| 176 | struct ufs_sb_info * sbi; | 174 | struct ufs_sb_info * sbi; |
| 177 | struct ufs_sb_private_info * uspi; | 175 | struct ufs_sb_private_info * uspi; |
| 178 | struct ufs_super_block_first * usb1; | ||
| 179 | struct ufs_cg_private_info * ucpi; | 176 | struct ufs_cg_private_info * ucpi; |
| 180 | struct ufs_cylinder_group * ucg; | 177 | struct ufs_cylinder_group * ucg; |
| 181 | struct inode * inode; | 178 | struct inode * inode; |
| @@ -195,7 +192,6 @@ struct inode *ufs_new_inode(struct inode *dir, umode_t mode) | |||
| 195 | ufsi = UFS_I(inode); | 192 | ufsi = UFS_I(inode); |
| 196 | sbi = UFS_SB(sb); | 193 | sbi = UFS_SB(sb); |
| 197 | uspi = sbi->s_uspi; | 194 | uspi = sbi->s_uspi; |
| 198 | usb1 = ubh_get_usb_first(uspi); | ||
| 199 | 195 | ||
| 200 | mutex_lock(&sbi->s_lock); | 196 | mutex_lock(&sbi->s_lock); |
| 201 | 197 | ||
diff --git a/fs/ufs/super.c b/fs/ufs/super.c index 3aad63394abc..0232f526a5cf 100644 --- a/fs/ufs/super.c +++ b/fs/ufs/super.c | |||
| @@ -1390,14 +1390,12 @@ static int ufs_statfs(struct dentry *dentry, struct kstatfs *buf) | |||
| 1390 | struct super_block *sb = dentry->d_sb; | 1390 | struct super_block *sb = dentry->d_sb; |
| 1391 | struct ufs_sb_private_info *uspi= UFS_SB(sb)->s_uspi; | 1391 | struct ufs_sb_private_info *uspi= UFS_SB(sb)->s_uspi; |
| 1392 | unsigned flags = UFS_SB(sb)->s_flags; | 1392 | unsigned flags = UFS_SB(sb)->s_flags; |
| 1393 | struct ufs_super_block_first *usb1; | ||
| 1394 | struct ufs_super_block_second *usb2; | 1393 | struct ufs_super_block_second *usb2; |
| 1395 | struct ufs_super_block_third *usb3; | 1394 | struct ufs_super_block_third *usb3; |
| 1396 | u64 id = huge_encode_dev(sb->s_bdev->bd_dev); | 1395 | u64 id = huge_encode_dev(sb->s_bdev->bd_dev); |
| 1397 | 1396 | ||
| 1398 | lock_ufs(sb); | 1397 | lock_ufs(sb); |
| 1399 | 1398 | ||
| 1400 | usb1 = ubh_get_usb_first(uspi); | ||
| 1401 | usb2 = ubh_get_usb_second(uspi); | 1399 | usb2 = ubh_get_usb_second(uspi); |
| 1402 | usb3 = ubh_get_usb_third(uspi); | 1400 | usb3 = ubh_get_usb_third(uspi); |
| 1403 | 1401 | ||
