projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Created a new test to check the size of YTIME_T
[yaffs2.git]
/
yaffs_tagsmarshall.c
diff --git
a/yaffs_tagsmarshall.c
b/yaffs_tagsmarshall.c
index c2e2369bb24731e58fce8d1ccfa1300232854932..d568208e91bd53ece6b685707ecca481c693c183 100644
(file)
--- a/
yaffs_tagsmarshall.c
+++ b/
yaffs_tagsmarshall.c
@@
-1,8
+1,7
@@
/*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
/*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
- * Copyright (C) 2002-2011 Aleph One Ltd.
- * for Toby Churchill Ltd and Brightstar Engineering
+ * Copyright (C) 2002-2018 Aleph One Ltd.
*
* Created by Charles Manning <charles@aleph1.co.uk>
*
*
* Created by Charles Manning <charles@aleph1.co.uk>
*
@@
-15,7
+14,7
@@
* tags storage.
*/
* tags storage.
*/
-#include "yaffs_
guts
.h"
+#include "yaffs_
tagsmarshall
.h"
#include "yaffs_trace.h"
#include "yaffs_packedtags2.h"
#include "yaffs_trace.h"
#include "yaffs_packedtags2.h"
@@
-101,6
+100,9
@@
static int yaffs_tags_marshall_read(struct yaffs_dev *dev,
BUG();
BUG();
+ if (retval == YAFFS_FAIL)
+ return YAFFS_FAIL;
+
if (dev->param.inband_tags) {
if (tags) {
struct yaffs_packed_tags2_tags_only *pt2tp;
if (dev->param.inband_tags) {
if (tags) {
struct yaffs_packed_tags2_tags_only *pt2tp;
@@
-122,7
+124,7
@@
static int yaffs_tags_marshall_read(struct yaffs_dev *dev,
dev->n_ecc_unfixed++;
}
dev->n_ecc_unfixed++;
}
- if (tags && ecc_result ==
-
YAFFS_ECC_RESULT_FIXED) {
+ if (tags && ecc_result == YAFFS_ECC_RESULT_FIXED) {
if (tags->ecc_result <= YAFFS_ECC_RESULT_NO_ERROR)
tags->ecc_result = YAFFS_ECC_RESULT_FIXED;
dev->n_ecc_fixed++;
if (tags->ecc_result <= YAFFS_ECC_RESULT_NO_ERROR)
tags->ecc_result = YAFFS_ECC_RESULT_FIXED;
dev->n_ecc_fixed++;
@@
-170,10
+172,7
@@
static int yaffs_tags_marshall_query_block(struct yaffs_dev *dev, int block_no,
"block query returns seq %d state %d",
*seq_number, *state);
"block query returns seq %d state %d",
*seq_number, *state);
- if (retval == 0)
- return YAFFS_OK;
- else
- return YAFFS_FAIL;
+ return retval;
}
static int yaffs_tags_marshall_mark_bad(struct yaffs_dev *dev, int block_no)
}
static int yaffs_tags_marshall_mark_bad(struct yaffs_dev *dev, int block_no)