diff options
| author | Seiji Aguchi <seiji.aguchi@hds.com> | 2012-11-14 20:27:28 +0000 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2012-11-26 16:02:12 -0800 |
| commit | a9efd39cd547223597cfe7c53acec44c099b9264 (patch) | |
| tree | 293feed9e89d811235371d389f7787eddf2899e1 /fs | |
| parent | 96480d9c8fcfd7e325e9be6a6c6846689707f8e0 (diff) | |
| download | op-kernel-dev-a9efd39cd547223597cfe7c53acec44c099b9264.zip op-kernel-dev-a9efd39cd547223597cfe7c53acec44c099b9264.tar.gz | |
efi_pstore: Add ctime to argument of erase callback
[Issue]
Currently, a variable name, which is used to identify each log entry, consists of type,
id and ctime. But an erase callback does not use ctime.
If efi_pstore supported just one log, type and id were enough.
However, in case of supporting multiple logs, it doesn't work because
it can't distinguish each entry without ctime at erasing time.
<Example>
As you can see below, efi_pstore can't differentiate first event from second one without ctime.
a variable name of first event: dump-type0-1-12345678
a variable name of second event: dump-type0-1-23456789
type:0
id:1
ctime:12345678, 23456789
[Solution]
This patch adds ctime to an argument of an erase callback.
It works across reboots because ctime of pstore means the date that the record was originally stored.
To do this, efi_pstore saves the ctime to variable name at writing time and passes it to pstore
at reading time.
Signed-off-by: Seiji Aguchi <seiji.aguchi@hds.com>
Acked-by: Mike Waychison <mikew@google.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/pstore/inode.c | 3 | ||||
| -rw-r--r-- | fs/pstore/ram.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c index 4ab572e..4300af6 100644 --- a/fs/pstore/inode.c +++ b/fs/pstore/inode.c @@ -175,7 +175,8 @@ static int pstore_unlink(struct inode *dir, struct dentry *dentry) struct pstore_private *p = dentry->d_inode->i_private; if (p->psi->erase) - p->psi->erase(p->type, p->id, p->psi); + p->psi->erase(p->type, p->id, dentry->d_inode->i_ctime, + p->psi); return simple_unlink(dir, dentry); } diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index 1a4f6da..749693f 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c @@ -237,7 +237,7 @@ static int notrace ramoops_pstore_write_buf(enum pstore_type_id type, } static int ramoops_pstore_erase(enum pstore_type_id type, u64 id, - struct pstore_info *psi) + struct timespec time, struct pstore_info *psi) { struct ramoops_context *cxt = psi->data; struct persistent_ram_zone *prz; |
