mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
romfs: romfs_iget() - unsigned ino >= 0 is always true
romfs_strnlen() returns int unsigned X >= 0 is always true [[email protected]: coding-style fixes] Signed-off-by: roel kluin <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
921d58c0e6
commit
f15659628b
1 changed files with 6 additions and 6 deletions
|
|
@ -490,7 +490,7 @@ static mode_t romfs_modemap[] =
|
|||
static struct inode *
|
||||
romfs_iget(struct super_block *sb, unsigned long ino)
|
||||
{
|
||||
int nextfh;
|
||||
int nextfh, ret;
|
||||
struct romfs_inode ri;
|
||||
struct inode *i;
|
||||
|
||||
|
|
@ -526,11 +526,11 @@ romfs_iget(struct super_block *sb, unsigned long ino)
|
|||
i->i_mtime.tv_nsec = i->i_atime.tv_nsec = i->i_ctime.tv_nsec = 0;
|
||||
|
||||
/* Precalculate the data offset */
|
||||
ino = romfs_strnlen(i, ino+ROMFH_SIZE, ROMFS_MAXFN);
|
||||
if (ino >= 0)
|
||||
ino = ((ROMFH_SIZE+ino+1+ROMFH_PAD)&ROMFH_MASK);
|
||||
else
|
||||
ino = 0;
|
||||
ret = romfs_strnlen(i, ino + ROMFH_SIZE, ROMFS_MAXFN);
|
||||
if (ret >= 0)
|
||||
ino = (ROMFH_SIZE + ret + 1 + ROMFH_PAD) & ROMFH_MASK;
|
||||
else
|
||||
ino = 0;
|
||||
|
||||
ROMFS_I(i)->i_metasize = ino;
|
||||
ROMFS_I(i)->i_dataoffset = ino+(i->i_ino&ROMFH_MASK);
|
||||
|
|
|
|||
Loading…
Reference in a new issue