Skip to content

Commit

Permalink
romfs: romfs_iget() - unsigned ino >= 0 is always true
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
RoelKluin authored and torvalds committed Jan 8, 2009
1 parent 921d58c commit f156596
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions fs/romfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit f156596

Please sign in to comment.