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

Commit 37044c86 authored by Roel Kluin's avatar Roel Kluin Committed by Linus Torvalds
Browse files

ufs: sector_t cannot be negative 



unsigned i_block,fragment cannot be negative.

Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Signed-off-by: default avatarEvgeniy 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 5404ac8e

fs/ufs/inode.c

+1 −9
Original line number Diff line number Diff line
@@ -56,9 +56,7 @@ static int ufs_block_to_path(struct inode *inode, sector_t i_block, sector_t off 




	UFSD("ptrs=uspi->s_apb = %d,double_blocks=%ld \n",ptrs,double_blocks);

	if (i_block < 0) {

		ufs_warning(inode->i_sb, "ufs_block_to_path", "block < 0");

	} else if (i_block < direct_blocks) {

	if (i_block < direct_blocks) {

		offsets[n++] = i_block;

	} else if ((i_block -= direct_blocks) < indirect_blocks) {

		offsets[n++] = UFS_IND_BLOCK;
@@ -440,8 +438,6 @@ int ufs_getfrag_block(struct inode *inode, sector_t fragment, struct buffer_head 
	lock_kernel();



	UFSD("ENTER, ino %lu, fragment %llu\n", inode->i_ino, (unsigned long long)fragment);

	if (fragment < 0)

		goto abort_negative;

	if (fragment >

	    ((UFS_NDADDR + uspi->s_apb + uspi->s_2apb + uspi->s_3apb)

	     << uspi->s_fpbshift))
@@ -504,10 +500,6 @@ abort: 
	unlock_kernel();

	return err;



abort_negative:

	ufs_warning(sb, "ufs_get_block", "block < 0");

	goto abort;



abort_too_big:

	ufs_warning(sb, "ufs_get_block", "block > big");

	goto abort;