Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e0bd34c authored by Christian Engelmayer's avatar Christian Engelmayer Committed by Linus Torvalds
Browse files

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: default avatarChristian Engelmayer <cengelma@gmx.at>
Cc: Evgeniy Dushistov <dushistov@mail.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 76ee4735

fs/ufs/balloc.c

+0 −12
Original line number Original line Diff line number Diff line
@@ -38,7 +38,6 @@ void ufs_free_fragments(struct inode *inode, u64 fragment, unsigned count) 
{

{

	struct super_block * sb;

	struct super_block * sb;

	struct ufs_sb_private_info * uspi;

	struct ufs_sb_private_info * uspi;

	struct ufs_super_block_first * usb1;

	struct ufs_cg_private_info * ucpi;

	struct ufs_cg_private_info * ucpi;

	struct ufs_cylinder_group * ucg;

	struct ufs_cylinder_group * ucg;

	unsigned cgno, bit, end_bit, bbase, blkmap, i;

	unsigned cgno, bit, end_bit, bbase, blkmap, i;
@@ -46,7 +45,6 @@ void ufs_free_fragments(struct inode *inode, u64 fragment, unsigned count) 
	

	

	sb = inode->i_sb;

	sb = inode->i_sb;

	uspi = UFS_SB(sb)->s_uspi;

	uspi = UFS_SB(sb)->s_uspi;

	usb1 = ubh_get_usb_first(uspi);

	

	

	UFSD("ENTER, fragment %llu, count %u\n",

	UFSD("ENTER, fragment %llu, count %u\n",

	     (unsigned long long)fragment, count);

	     (unsigned long long)fragment, count);
@@ -135,7 +133,6 @@ void ufs_free_blocks(struct inode *inode, u64 fragment, unsigned count) 
{

{

	struct super_block * sb;

	struct super_block * sb;

	struct ufs_sb_private_info * uspi;

	struct ufs_sb_private_info * uspi;

	struct ufs_super_block_first * usb1;

	struct ufs_cg_private_info * ucpi;

	struct ufs_cg_private_info * ucpi;

	struct ufs_cylinder_group * ucg;

	struct ufs_cylinder_group * ucg;

	unsigned overflow, cgno, bit, end_bit, i;

	unsigned overflow, cgno, bit, end_bit, i;
@@ -143,7 +140,6 @@ void ufs_free_blocks(struct inode *inode, u64 fragment, unsigned count) 
	

	

	sb = inode->i_sb;

	sb = inode->i_sb;

	uspi = UFS_SB(sb)->s_uspi;

	uspi = UFS_SB(sb)->s_uspi;

	usb1 = ubh_get_usb_first(uspi);





	UFSD("ENTER, fragment %llu, count %u\n",

	UFSD("ENTER, fragment %llu, count %u\n",

	     (unsigned long long)fragment, count);

	     (unsigned long long)fragment, count);
@@ -499,7 +495,6 @@ static u64 ufs_add_fragments(struct inode *inode, u64 fragment, 
{

{

	struct super_block * sb;

	struct super_block * sb;

	struct ufs_sb_private_info * uspi;

	struct ufs_sb_private_info * uspi;

	struct ufs_super_block_first * usb1;

	struct ufs_cg_private_info * ucpi;

	struct ufs_cg_private_info * ucpi;

	struct ufs_cylinder_group * ucg;

	struct ufs_cylinder_group * ucg;

	unsigned cgno, fragno, fragoff, count, fragsize, i;

	unsigned cgno, fragno, fragoff, count, fragsize, i;
@@ -509,7 +504,6 @@ static u64 ufs_add_fragments(struct inode *inode, u64 fragment, 
	

	

	sb = inode->i_sb;

	sb = inode->i_sb;

	uspi = UFS_SB(sb)->s_uspi;

	uspi = UFS_SB(sb)->s_uspi;

	usb1 = ubh_get_usb_first (uspi);

	count = newcount - oldcount;

	count = newcount - oldcount;

	

	

	cgno = ufs_dtog(uspi, fragment);

	cgno = ufs_dtog(uspi, fragment);
@@ -577,7 +571,6 @@ static u64 ufs_alloc_fragments(struct inode *inode, unsigned cgno, 
{

{

	struct super_block * sb;

	struct super_block * sb;

	struct ufs_sb_private_info * uspi;

	struct ufs_sb_private_info * uspi;

	struct ufs_super_block_first * usb1;

	struct ufs_cg_private_info * ucpi;

	struct ufs_cg_private_info * ucpi;

	struct ufs_cylinder_group * ucg;

	struct ufs_cylinder_group * ucg;

	unsigned oldcg, i, j, k, allocsize;

	unsigned oldcg, i, j, k, allocsize;
@@ -588,7 +581,6 @@ static u64 ufs_alloc_fragments(struct inode *inode, unsigned cgno, 




	sb = inode->i_sb;

	sb = inode->i_sb;

	uspi = UFS_SB(sb)->s_uspi;

	uspi = UFS_SB(sb)->s_uspi;

	usb1 = ubh_get_usb_first(uspi);

	oldcg = cgno;

	oldcg = cgno;

	

	

	/*

	/*
@@ -690,7 +682,6 @@ static u64 ufs_alloccg_block(struct inode *inode, 
{

{

	struct super_block * sb;

	struct super_block * sb;

	struct ufs_sb_private_info * uspi;

	struct ufs_sb_private_info * uspi;

	struct ufs_super_block_first * usb1;

	struct ufs_cylinder_group * ucg;

	struct ufs_cylinder_group * ucg;

	u64 result, blkno;

	u64 result, blkno;
@@ -698,7 +689,6 @@ static u64 ufs_alloccg_block(struct inode *inode, 




	sb = inode->i_sb;

	sb = inode->i_sb;

	uspi = UFS_SB(sb)->s_uspi;

	uspi = UFS_SB(sb)->s_uspi;

	usb1 = ubh_get_usb_first(uspi);

	ucg = ubh_get_ucg(UCPI_UBH(ucpi));

	ucg = ubh_get_ucg(UCPI_UBH(ucpi));





	if (goal == 0) {

	if (goal == 0) {
@@ -794,7 +784,6 @@ static u64 ufs_bitmap_search(struct super_block *sb, 
		0x0, 0x2, 0x6, 0xe, 0x1e, 0x3e, 0x7e, 0xfe, 0x1fe

		0x0, 0x2, 0x6, 0xe, 0x1e, 0x3e, 0x7e, 0xfe, 0x1fe

	};

	};

	struct ufs_sb_private_info *uspi = UFS_SB(sb)->s_uspi;

	struct ufs_sb_private_info *uspi = UFS_SB(sb)->s_uspi;

	struct ufs_super_block_first *usb1;

	struct ufs_cylinder_group *ucg;

	struct ufs_cylinder_group *ucg;

	unsigned start, length, loc;

	unsigned start, length, loc;

	unsigned pos, want, blockmap, mask, end;

	unsigned pos, want, blockmap, mask, end;
@@ -803,7 +792,6 @@ static u64 ufs_bitmap_search(struct super_block *sb, 
	UFSD("ENTER, cg %u, goal %llu, count %u\n", ucpi->c_cgx,

	UFSD("ENTER, cg %u, goal %llu, count %u\n", ucpi->c_cgx,

	     (unsigned long long)goal, count);

	     (unsigned long long)goal, count);





	usb1 = ubh_get_usb_first (uspi);

	ucg = ubh_get_ucg(UCPI_UBH(ucpi));

	ucg = ubh_get_ucg(UCPI_UBH(ucpi));





	if (goal)

	if (goal)

fs/ufs/ialloc.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -57,7 +57,6 @@ void ufs_free_inode (struct inode * inode) 
{

{

	struct super_block * sb;

	struct super_block * sb;

	struct ufs_sb_private_info * uspi;

	struct ufs_sb_private_info * uspi;

	struct ufs_super_block_first * usb1;

	struct ufs_cg_private_info * ucpi;

	struct ufs_cg_private_info * ucpi;

	struct ufs_cylinder_group * ucg;

	struct ufs_cylinder_group * ucg;

	int is_directory;

	int is_directory;
@@ -67,7 +66,6 @@ void ufs_free_inode (struct inode * inode) 




	sb = inode->i_sb;

	sb = inode->i_sb;

	uspi = UFS_SB(sb)->s_uspi;

	uspi = UFS_SB(sb)->s_uspi;

	usb1 = ubh_get_usb_first(uspi);

	

	

	ino = inode->i_ino;

	ino = inode->i_ino;
@@ -175,7 +173,6 @@ struct inode *ufs_new_inode(struct inode *dir, umode_t mode) 
	struct super_block * sb;

	struct super_block * sb;

	struct ufs_sb_info * sbi;

	struct ufs_sb_info * sbi;

	struct ufs_sb_private_info * uspi;

	struct ufs_sb_private_info * uspi;

	struct ufs_super_block_first * usb1;

	struct ufs_cg_private_info * ucpi;

	struct ufs_cg_private_info * ucpi;

	struct ufs_cylinder_group * ucg;

	struct ufs_cylinder_group * ucg;

	struct inode * inode;

	struct inode * inode;
@@ -195,7 +192,6 @@ struct inode *ufs_new_inode(struct inode *dir, umode_t mode) 
	ufsi = UFS_I(inode);

	ufsi = UFS_I(inode);

	sbi = UFS_SB(sb);

	sbi = UFS_SB(sb);

	uspi = sbi->s_uspi;

	uspi = sbi->s_uspi;

	usb1 = ubh_get_usb_first(uspi);





	mutex_lock(&sbi->s_lock);

	mutex_lock(&sbi->s_lock);

fs/ufs/super.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -1390,14 +1390,12 @@ static int ufs_statfs(struct dentry *dentry, struct kstatfs *buf) 
	struct super_block *sb = dentry->d_sb;

	struct super_block *sb = dentry->d_sb;

	struct ufs_sb_private_info *uspi= UFS_SB(sb)->s_uspi;

	struct ufs_sb_private_info *uspi= UFS_SB(sb)->s_uspi;

	unsigned  flags = UFS_SB(sb)->s_flags;

	unsigned  flags = UFS_SB(sb)->s_flags;

	struct ufs_super_block_first *usb1;

	struct ufs_super_block_second *usb2;

	struct ufs_super_block_second *usb2;

	struct ufs_super_block_third *usb3;

	struct ufs_super_block_third *usb3;

	u64 id = huge_encode_dev(sb->s_bdev->bd_dev);

	u64 id = huge_encode_dev(sb->s_bdev->bd_dev);





	lock_ufs(sb);

	lock_ufs(sb);





	usb1 = ubh_get_usb_first(uspi);

	usb2 = ubh_get_usb_second(uspi);

	usb2 = ubh_get_usb_second(uspi);

	usb3 = ubh_get_usb_third(uspi);

	usb3 = ubh_get_usb_third(uspi);