android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jffs2: refactor csize usage in jffs2_do_read_inode_internal()

Browse Source 
Replace the verbose `je32_to_cpu(latest_node->csize)' with a shorter
`csize'.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Cc: Artem Bityutskiy <dedekind1@gmail.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Xi Wang 2012-04-25 14:45:23 -04:00 committed by David Woodhouse
parent 7c80c35233
commit b6778fd781
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/jffs2/readinode.c
View File

@ -1272,19 +1272,19 @@ static int jffs2_do_read_inode_internal(struct jffs2_sb_info *c,
jffs2_do_clear_inode(c, f); jffs2_do_clear_inode(c, f);
return -ENAMETOOLONG; return -ENAMETOOLONG;
} }
f->target = kmalloc(je32_to_cpu(latest_node->csize) + 1, GFP_KERNEL); f->target = kmalloc(csize + 1, GFP_KERNEL);
if (!f->target) { if (!f->target) {
JFFS2_ERROR("can't allocate %d bytes of memory for the symlink target path cache\n", je32_to_cpu(latest_node->csize)); JFFS2_ERROR("can't allocate %u bytes of memory for the symlink target path cache\n", csize);
mutex_unlock(&f->sem); mutex_unlock(&f->sem);
jffs2_do_clear_inode(c, f); jffs2_do_clear_inode(c, f);
return -ENOMEM; return -ENOMEM;
} }
ret = jffs2_flash_read(c, ref_offset(rii.latest_ref) + sizeof(*latest_node), ret = jffs2_flash_read(c, ref_offset(rii.latest_ref) + sizeof(*latest_node),
je32_to_cpu(latest_node->csize), &retlen, (char *)f->target); csize, &retlen, (char *)f->target);
if (ret || retlen != je32_to_cpu(latest_node->csize)) { if (ret || retlen != csize) {
if (retlen != je32_to_cpu(latest_node->csize)) if (retlen != csize)
ret = -EIO; ret = -EIO;
kfree(f->target); kfree(f->target);
f->target = NULL; f->target = NULL;
@ -1293,7 +1293,7 @@ static int jffs2_do_read_inode_internal(struct jffs2_sb_info *c,
return ret; return ret;
} }
f->target[je32_to_cpu(latest_node->csize)] = '\0'; f->target[csize] = '\0';
dbg_readinode("symlink's target '%s' cached\n", f->target); dbg_readinode("symlink's target '%s' cached\n", f->target);
} }