aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiu ShuoX <shuox.liu@intel.com>2014-03-17 11:24:49 +1100
committerMark Salyzyn <salyzyn@google.com>2015-01-13 16:18:42 -0800
commit6a148888b00dbcb8e76c4ff33b062f6ca5f0cdd9 (patch)
tree9ea98401ce94788794a398e62a89654a873c8999
parent2e09fe094acd1fb26b9ce242df045ceef042a2a0 (diff)
downloadlinux-linaro-stable-6a148888b00dbcb8e76c4ff33b062f6ca5f0cdd9.tar.gz
pstore: clarify clearing of _read_cnt in ramoops_context
*_read_cnt in ramoops_context need to be cleared during pstore ->open to support mutli times getting the records. The patch added missed ftrace_read_cnt clearing and removed duplicate clearing in ramoops_probe. Signed-off-by: Liu ShuoX <shuox.liu@intel.com> Cc: "Zhang, Yanmin" <yanmin_zhang@linux.intel.com> Cc: Colin Cross <ccross@android.com> Cc: Kees Cook <keescook@chromium.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Tony Luck <tony.luck@intel.com> Change-Id: I98622b2587ed661884e74a7273cfc92ee99eaae3
-rw-r--r--fs/pstore/ram.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 058f17f0b466..1107bc1edd92 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -86,6 +86,7 @@ struct ramoops_context {
struct persistent_ram_ecc_info ecc_info;
unsigned int max_dump_cnt;
unsigned int dump_write_cnt;
+ /* _read_cnt need clear on ramoops_pstore_open */
unsigned int dump_read_cnt;
unsigned int console_read_cnt;
unsigned int ftrace_read_cnt;
@@ -101,6 +102,7 @@ static int ramoops_pstore_open(struct pstore_info *psi)
cxt->dump_read_cnt = 0;
cxt->console_read_cnt = 0;
+ cxt->ftrace_read_cnt = 0;
return 0;
}
@@ -414,7 +416,6 @@ static int ramoops_probe(struct platform_device *pdev)
if (!is_power_of_2(pdata->ftrace_size))
pdata->ftrace_size = rounddown_pow_of_two(pdata->ftrace_size);
- cxt->dump_read_cnt = 0;
cxt->size = pdata->mem_size;
cxt->phys_addr = pdata->mem_address;
cxt->record_size = pdata->record_size;