android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pstore: Extend API for more flexibility in new backends

Browse Source 
Some pstore implementations may not have a static context, so extend the
API to pass the pstore_info struct to all calls and allow for a context
pointer.

Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
Matthew Garrett 2011-07-21 16:57:52 -04:00 committed by Tony Luck
parent 02f8c6aee8
commit 638c1fd303
5 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/acpi/apei/erst.c
View File

@ -932,8 +932,10 @@ static int erst_check_table(struct acpi_table_erst *erst_tab)
static int erst_open_pstore(struct pstore_info *psi); static int erst_open_pstore(struct pstore_info *psi);
static int erst_close_pstore(struct pstore_info *psi); static int erst_close_pstore(struct pstore_info *psi);
static ssize_t erst_reader(u64 *id, enum pstore_type_id *type, static ssize_t erst_reader(u64 *id, enum pstore_type_id *type,
struct timespec *time); struct timespec *time, struct pstore_info *psi);
static u64 erst_writer(enum pstore_type_id type, size_t size); static u64 erst_writer(enum pstore_type_id type, size_t size,
struct pstore_info *psi);
static int erst_clearer(u64 id, struct pstore_info *psi);
static struct pstore_info erst_info = { static struct pstore_info erst_info = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
@ -942,7 +944,7 @@ static struct pstore_info erst_info = {
.close = erst_close_pstore, .close = erst_close_pstore,
.read = erst_reader, .read = erst_reader,
.write = erst_writer, .write = erst_writer,
.erase = erst_clear .erase = erst_clearer
}; };
#define CPER_CREATOR_PSTORE \ #define CPER_CREATOR_PSTORE \
@ -983,7 +985,7 @@ static int erst_close_pstore(struct pstore_info *psi)
} }
static ssize_t erst_reader(u64 *id, enum pstore_type_id *type, static ssize_t erst_reader(u64 *id, enum pstore_type_id *type,
struct timespec *time) struct timespec *time, struct pstore_info *psi)
{ {
int rc; int rc;
ssize_t len = 0; ssize_t len = 0;
@ -1037,7 +1039,8 @@ static ssize_t erst_reader(u64 *id, enum pstore_type_id *type,
return (rc < 0) ? rc : (len - sizeof(*rcd)); return (rc < 0) ? rc : (len - sizeof(*rcd));
} }
static u64 erst_writer(enum pstore_type_id type, size_t size) static u64 erst_writer(enum pstore_type_id type, size_t size,
struct pstore_info *psi)
{ {
struct cper_pstore_record *rcd = (struct cper_pstore_record *) struct cper_pstore_record *rcd = (struct cper_pstore_record *)
(erst_info.buf - sizeof(*rcd)); (erst_info.buf - sizeof(*rcd));
@ -1080,6 +1083,11 @@ static u64 erst_writer(enum pstore_type_id type, size_t size)
return rcd->hdr.record_id; return rcd->hdr.record_id;
} }
static int erst_clearer(u64 id, struct pstore_info *psi)
{
return erst_clear(id);
}
static int __init erst_init(void) static int __init erst_init(void)
{ {
int rc = 0; int rc = 0;

10
fs/pstore/inode.c
View File

@ -40,7 +40,7 @@
struct pstore_private { struct pstore_private {
u64 id; u64 id;
int (*erase)(u64); struct pstore_info *psi;
ssize_t size; ssize_t size;
char data[]; char data[];
}; };
@ -73,7 +73,7 @@ static int pstore_unlink(struct inode *dir, struct dentry *dentry)
{ {
struct pstore_private *p = dentry->d_inode->i_private; struct pstore_private *p = dentry->d_inode->i_private;
p->erase(p->id); p->psi->erase(p->id, p->psi);
return simple_unlink(dir, dentry); return simple_unlink(dir, dentry);
} }
@ -175,8 +175,8 @@ int pstore_is_mounted(void)
* Set the mtime & ctime to the date that this record was originally stored. * Set the mtime & ctime to the date that this record was originally stored.
*/ */
int pstore_mkfile(enum pstore_type_id type, char *psname, u64 id, int pstore_mkfile(enum pstore_type_id type, char *psname, u64 id,
char *data, size_t size, char *data, size_t size, struct timespec time,
struct timespec time, int (*erase)(u64)) struct pstore_info *psi)
{ {
struct dentry *root = pstore_sb->s_root; struct dentry *root = pstore_sb->s_root;
struct dentry *dentry; struct dentry *dentry;
@ -193,7 +193,7 @@ int pstore_mkfile(enum pstore_type_id type, char *psname, u64 id,
if (!private) if (!private)
goto fail_alloc; goto fail_alloc;
private->id = id; private->id = id;
private->erase = erase; private->psi = psi;
switch (type) { switch (type) {
case PSTORE_TYPE_DMESG: case PSTORE_TYPE_DMESG:

2
fs/pstore/internal.h
View File

@ -2,5 +2,5 @@ extern void pstore_set_kmsg_bytes(int);
extern void pstore_get_records(void); extern void pstore_get_records(void);
extern int pstore_mkfile(enum pstore_type_id, char *psname, u64 id, extern int pstore_mkfile(enum pstore_type_id, char *psname, u64 id,
char *data, size_t size, char *data, size_t size,
struct timespec time, int (*erase)(u64)); struct timespec time, struct pstore_info *psi);
extern int pstore_is_mounted(void); extern int pstore_is_mounted(void);

13
fs/pstore/platform.c
View File

@ -94,11 +94,12 @@ static void pstore_dump(struct kmsg_dumper *dumper,
memcpy(dst, s1 + s1_start, l1_cpy); memcpy(dst, s1 + s1_start, l1_cpy);
memcpy(dst + l1_cpy, s2 + s2_start, l2_cpy); memcpy(dst + l1_cpy, s2 + s2_start, l2_cpy);
id = psinfo->write(PSTORE_TYPE_DMESG, hsize + l1_cpy + l2_cpy); id = psinfo->write(PSTORE_TYPE_DMESG, hsize + l1_cpy + l2_cpy,
psinfo);
if (reason == KMSG_DUMP_OOPS && pstore_is_mounted()) if (reason == KMSG_DUMP_OOPS && pstore_is_mounted())
pstore_mkfile(PSTORE_TYPE_DMESG, psinfo->name, id, pstore_mkfile(PSTORE_TYPE_DMESG, psinfo->name, id,
psinfo->buf, hsize + l1_cpy + l2_cpy, psinfo->buf, hsize + l1_cpy + l2_cpy,
CURRENT_TIME, psinfo->erase); CURRENT_TIME, psinfo);
l1 -= l1_cpy; l1 -= l1_cpy;
l2 -= l2_cpy; l2 -= l2_cpy;
total += l1_cpy + l2_cpy; total += l1_cpy + l2_cpy;
@ -166,9 +167,9 @@ void pstore_get_records(void)
if (rc) if (rc)
goto out; goto out;
while ((size = psi->read(&id, &type, &time)) > 0) { while ((size = psi->read(&id, &type, &time, psi)) > 0) {
if (pstore_mkfile(type, psi->name, id, psi->buf, (size_t)size, if (pstore_mkfile(type, psi->name, id, psi->buf, (size_t)size,
time, psi->erase)) time, psi))
failed++; failed++;
} }
psi->close(psi); psi->close(psi);
@ -196,10 +197,10 @@ int pstore_write(enum pstore_type_id type, char *buf, size_t size)
mutex_lock(&psinfo->buf_mutex); mutex_lock(&psinfo->buf_mutex);
memcpy(psinfo->buf, buf, size); memcpy(psinfo->buf, buf, size);
id = psinfo->write(type, size); id = psinfo->write(type, size, psinfo);
if (pstore_is_mounted()) if (pstore_is_mounted())
pstore_mkfile(PSTORE_TYPE_DMESG, psinfo->name, id, psinfo->buf, pstore_mkfile(PSTORE_TYPE_DMESG, psinfo->name, id, psinfo->buf,
size, CURRENT_TIME, psinfo->erase); size, CURRENT_TIME, psinfo);
mutex_unlock(&psinfo->buf_mutex); mutex_unlock(&psinfo->buf_mutex);
return 0; return 0;

8
include/linux/pstore.h
View File

@ -38,9 +38,11 @@ struct pstore_info {
int (*open)(struct pstore_info *psi); int (*open)(struct pstore_info *psi);
int (*close)(struct pstore_info *psi); int (*close)(struct pstore_info *psi);
ssize_t (*read)(u64 *id, enum pstore_type_id *type, ssize_t (*read)(u64 *id, enum pstore_type_id *type,
struct timespec *time); struct timespec *time, struct pstore_info *psi);
u64 (*write)(enum pstore_type_id type, size_t size); u64 (*write)(enum pstore_type_id type, size_t size,
int (*erase)(u64 id); struct pstore_info *psi);
int (*erase)(u64 id, struct pstore_info *psi);
void *data;
}; };
#ifdef CONFIG_PSTORE #ifdef CONFIG_PSTORE