fs: jffs2: fix error value sign
Subsystems (3)
PATCH 1/1 fs: jffs2: fix error value sign
do_verify_xattr_datum(), do_load_xattr_datum(), load_xattr_datum() and verify_xattr_ref() should return negative value on error. Sometimes they return EIO that is positive. Change this to -EIO.
---
This driver is not compilable, so the patch is not tested.
fs/jffs2/xattr.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
fs/jffs2/xattr.c +6 -6
@@ -151,7 +151,7 @@ static int do_verify_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datJFFS2_ERROR ("node CRC failed at %#08x, read=%#08x, calc=%#08x\n" , offset,je32_to_cpu (rx.hdr_crc), crc); xd->flags |=JFFS2_XFLAGS_INVALID ; -return EIO ; +return -EIO ; } totlen =PAD (sizeof (rx) + rx.name_len +1 +je16_to_cpu (rx.value_len)); if (je16_to_cpu(rx.magic) != JFFS2_MAGIC_BITMASK
@@ -167,7 +167,7 @@ static int do_verify_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datje32_to_cpu (rx.xid), xd->xid, je32_to_cpu(rx.version), xd->version); xd->flags |=JFFS2_XFLAGS_INVALID ; -return EIO ; +return -EIO ; } xd->xprefix = rx.xprefix; xd->name_len = rx.name_len;
@@ -230,7 +230,7 @@ static int do_load_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum ref_offset(xd->node), xd->data_crc, crc);kfree (data); xd->flags |=JFFS2_XFLAGS_INVALID ; -return EIO ; +return -EIO ; } xd->flags |=JFFS2_XFLAGS_HOT ;
@@ -268,7 +268,7 @@ static int load_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum *xif (xd->xname)return 0 ;if (xd->flags &JFFS2_XFLAGS_INVALID ) -return EIO ; +return -EIO ;if (unlikely (is_xattr_datum_unchecked (c, xd))) rc =do_verify_xattr_datum (c, xd);if (!rc)
@@ -460,7 +460,7 @@ static int verify_xattr_ref(struct jffs2_sb_info *c, struct jffs2_xattr_ref *refif (crc !=je32_to_cpu (rr.node_crc)) {JFFS2_ERROR ("node CRC failed at %#08x, read=%#08x, calc=%#08x\n" , offset,je32_to_cpu (rr.node_crc), crc); -return EIO ; +return -EIO ; }if (je16_to_cpu (rr.magic) !=JFFS2_MAGIC_BITMASK || je16_to_cpu(rr.nodetype) != JFFS2_NODETYPE_XREF
@@ -470,7 +470,7 @@ static int verify_xattr_ref(struct jffs2_sb_info *c, struct jffs2_xattr_ref *ref offset,je16_to_cpu (rr.magic),JFFS2_MAGIC_BITMASK ,je16_to_cpu (rr.nodetype),JFFS2_NODETYPE_XREF , je32_to_cpu(rr.totlen), PAD(sizeof(rr))); -return EIO ; +return -EIO ; } ref->ino =je32_to_cpu (rr.ino); ref->xid =je32_to_cpu (rr.xid);
Signature · 1 line
1.7.0.4
Quoted 8 lines · Vasiliy Kulikov
do_verify_xattr_datum(),do_load_xattr_datum(),load_xattr_datum()andverify_xattr_ref()should return negative value on error. Sometimes they return EIO that is positive. Change this to-EIO.Signed-off-by Vasiliy Kulikov <[email protected]>---
This driver is not compilable, so the patch is not tested.
It compiles.
regards,
dan carpenter
Quoted 11 lines · Dan Carpenter
Quoted 8 lines · Vasiliy Kulikov
do_verify_xattr_datum(),do_load_xattr_datum(),load_xattr_datum()andverify_xattr_ref()should return negative value on error. Sometimes they return EIO that is positive. Change this to-EIO.Signed-off-by Vasiliy Kulikov <[email protected]>---
This driver is not compilable, so the patch is not tested.It compiles.
Really?
x86_64, linux-next:
make -C /home/vasya/linux fs/jffs2/xattr.o
make: Вход в каталог `/home/vasya/dev/linux-next'
CHK include/linux/version.h CHK include/generated/utsrelease.h CALL scripts/checksyscalls.sh CC fs/jffs2/xattr.o
fs/jffs2/xattr.c: In function ‘unload_xattr_datum’:fs/jffs2/xattr.c:87: error: ‘struct jffs2_sb_info’ has no member named ‘xdatum_mem_usage’ fs/jffs2/xattr.c: In function ‘reclaim_xattr_datum’: fs/jffs2/xattr.c:105: error: ‘struct jffs2_sb_info’ has no member named ‘xdatum_mem_threshold’ fs/jffs2/xattr.c:105: error: ‘struct jffs2_sb_info’ has no member named ‘xdatum_mem_usage’ fs/jffs2/xattr.c:108: error: ‘struct jffs2_sb_info’ has no member named ‘xdatum_mem_usage’ fs/jffs2/xattr.c:109: error: ‘struct jffs2_sb_info’ has no member named ‘xdatum_mem_usage’ fs/jffs2/xattr.c:110: error: ‘XATTRINDEX_HASHSIZE’ undeclared (first use
in this function) fs/jffs2/xattr.c:110: error: (Each undeclared identifier is reported
only oncefs/jffs2/xattr.c:110: error: for each function it appears in.)
For both defconfig and allyesconfig.
Quoted 8 lines
regards,
dan carpenter--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 1 line
Vasiliy
Quoted 5 lines · Vasiliy Kulikov
x86_64, linux-next:make -C
/home/vasya/linuxfs/jffs2/xattr.o
make: Вход в каталог `/home/vasya/dev/linux-next'
^^^^^^^^^^^^^^
This means "Entering directory" right? So /home/vasya/linux is a symlink to /home/vasya/dev/linux-next. It still compiles for me when I create a symlink and use the -C option...
Quoted 4 lines
CHK include/linux/version.h CHK include/generated/utsrelease.h CALL scripts/checksyscalls.sh CC fs/jffs2/xattr.o
Quoted 11 lines
fs/jffs2/xattr.c: In function ‘unload_xattr_datum’:fs/jffs2/xattr.c:87: error: ‘struct jffs2_sb_info’ has no member named ‘xdatum_mem_usage’fs/jffs2/xattr.c: In function ‘reclaim_xattr_datum’:fs/jffs2/xattr.c:105: error: ‘struct jffs2_sb_info’ has no member named ‘xdatum_mem_threshold’fs/jffs2/xattr.c:105: error: ‘struct jffs2_sb_info’ has no member named ‘xdatum_mem_usage’fs/jffs2/xattr.c:108: error: ‘struct jffs2_sb_info’ has no member named ‘xdatum_mem_usage’fs/jffs2/xattr.c:109: error: ‘struct jffs2_sb_info’ has no member named ‘xdatum_mem_usage’fs/jffs2/xattr.c:110: error: ‘XATTRINDEX_HASHSIZE’ undeclared (first use
in this function)fs/jffs2/xattr.c:110: error: (Each undeclared identifier is reported
only oncefs/jffs2/xattr.c:110: error: for each function it appears in.)
It's not pulling in the CONFIG_JFFS2_FS_XATTR=y for some reason. Is there an environment variable which it uses to pull in your config file? An allyesconfig or an allmodconfig should work.
regards,
dan carpenter
Quoted 11 lines · Dan Carpenter
Quoted 5 lines · Vasiliy Kulikov
x86_64, linux-next:make -C
/home/vasya/linuxfs/jffs2/xattr.o
make: Вход в каталог `/home/vasya/dev/linux-next'^^^^^^^^^^^^^^This means "Entering directory" right? So
/home/vasya/linuxis a symlink to/home/vasya/dev/linux-next. It still compiles for me when I create a symlink and use the -C option...
Correct, but the same with cd ~linux/ && make fs/jffs2/xattr.o.
I've just updated to next-2010111 and it became compilable ;) linux next is just very nonstable...
Thanks,
Signature · 1 line
Vasiliy
Artem Bityutskiy
AppliedQuoted 5 lines · Vasiliy Kulikov
do_verify_xattr_datum(),do_load_xattr_datum(),load_xattr_datum()andverify_xattr_ref()should return negative value on error. Sometimes they return EIO that is positive. Change this to-EIO.Signed-off-by Vasiliy Kulikov <[email protected]>
Pushed to l2-mtd-2.6.git, thanks.
Signature · 2 lines
Best Regards, Artem Bityutskiy (Артём Битюцкий)