jffs2: refactor csize usage in jffs2_do_read_inode_internal()
authorXi Wang <xi.wang@gmail.com>
Wed, 25 Apr 2012 18:45:23 +0000 (14:45 -0400)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 14 May 2012 04:08:57 +0000 (23:08 -0500)
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>
fs/jffs2/readinode.c

index 9897f38af70739dc85e2beda205578906c678a19..3833d74f2305b9fd35fb08f7878d5fdfe1239de2 100644 (file)
@@ -1272,19 +1272,19 @@ static int jffs2_do_read_inode_internal(struct jffs2_sb_info *c,
                                jffs2_do_clear_inode(c, f);
                                return -ENAMETOOLONG;
                        }
-                       f->target = kmalloc(je32_to_cpu(latest_node->csize) + 1, GFP_KERNEL);
+                       f->target = kmalloc(csize + 1, GFP_KERNEL);
                        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);
                                jffs2_do_clear_inode(c, f);
                                return -ENOMEM;
                        }
 
                        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 (retlen != je32_to_cpu(latest_node->csize))
+                       if (ret || retlen != csize) {
+                               if (retlen != csize)
                                        ret = -EIO;
                                kfree(f->target);
                                f->target = NULL;
@@ -1293,7 +1293,7 @@ static int jffs2_do_read_inode_internal(struct jffs2_sb_info *c,
                                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);
                }