Commit 2174f6df authored by Kees Cook's avatar Kees Cook Committed by Tony Luck

pstore: gracefully handle NULL pstore_info functions

If a pstore backend doesn't want to support various portions of the
pstore interface, it can just leave those functions NULL instead of
creating no-op stubs.
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 3d6d8d20
...@@ -80,7 +80,8 @@ static int pstore_unlink(struct inode *dir, struct dentry *dentry) ...@@ -80,7 +80,8 @@ 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->psi->erase(p->type, p->id, p->psi); if (p->psi->erase)
p->psi->erase(p->type, p->id, p->psi);
return simple_unlink(dir, dentry); return simple_unlink(dir, dentry);
} }
......
...@@ -207,8 +207,7 @@ void pstore_get_records(int quiet) ...@@ -207,8 +207,7 @@ void pstore_get_records(int quiet)
return; return;
mutex_lock(&psi->read_mutex); mutex_lock(&psi->read_mutex);
rc = psi->open(psi); if (psi->open && psi->open(psi))
if (rc)
goto out; goto out;
while ((size = psi->read(&id, &type, &time, &buf, psi)) > 0) { while ((size = psi->read(&id, &type, &time, &buf, psi)) > 0) {
...@@ -219,7 +218,8 @@ void pstore_get_records(int quiet) ...@@ -219,7 +218,8 @@ void pstore_get_records(int quiet)
if (rc && (rc != -EEXIST || !quiet)) if (rc && (rc != -EEXIST || !quiet))
failed++; failed++;
} }
psi->close(psi); if (psi->close)
psi->close(psi);
out: out:
mutex_unlock(&psi->read_mutex); mutex_unlock(&psi->read_mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment