提交 f1565962 编写于 作者: R roel kluin 提交者: Linus Torvalds

romfs: romfs_iget() - unsigned ino >= 0 is always true

romfs_strnlen() returns int
unsigned X >= 0 is always true

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Nroel kluin <roel.kluin@gmail.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 921d58c0
...@@ -490,7 +490,7 @@ static mode_t romfs_modemap[] = ...@@ -490,7 +490,7 @@ static mode_t romfs_modemap[] =
static struct inode * static struct inode *
romfs_iget(struct super_block *sb, unsigned long ino) romfs_iget(struct super_block *sb, unsigned long ino)
{ {
int nextfh; int nextfh, ret;
struct romfs_inode ri; struct romfs_inode ri;
struct inode *i; struct inode *i;
...@@ -526,11 +526,11 @@ romfs_iget(struct super_block *sb, unsigned long ino) ...@@ -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; i->i_mtime.tv_nsec = i->i_atime.tv_nsec = i->i_ctime.tv_nsec = 0;
/* Precalculate the data offset */ /* Precalculate the data offset */
ino = romfs_strnlen(i, ino+ROMFH_SIZE, ROMFS_MAXFN); ret = romfs_strnlen(i, ino + ROMFH_SIZE, ROMFS_MAXFN);
if (ino >= 0) if (ret >= 0)
ino = ((ROMFH_SIZE+ino+1+ROMFH_PAD)&ROMFH_MASK); ino = (ROMFH_SIZE + ret + 1 + ROMFH_PAD) & ROMFH_MASK;
else else
ino = 0; ino = 0;
ROMFS_I(i)->i_metasize = ino; ROMFS_I(i)->i_metasize = ino;
ROMFS_I(i)->i_dataoffset = ino+(i->i_ino&ROMFH_MASK); ROMFS_I(i)->i_dataoffset = ino+(i->i_ino&ROMFH_MASK);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册