diff options
| author | Kees Cook <keescook@chromium.org> | 2011-11-19 01:49:00 +0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2011-11-19 01:49:00 +0400 |
| commit | 2174f6df7891fa331800beb72634c969f017900b (patch) | |
| tree | f9253298863844903b0ed76c7e9ae1f663b1a9d3 | |
| parent | 3d6d8d20ec4fd3b256632edb373a9c504724b8a9 (diff) | |
| download | linux-2174f6df7891fa331800beb72634c969f017900b.tar.xz | |
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: Kees Cook <keescook@chromium.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
| -rw-r--r-- | fs/pstore/inode.c | 3 | ||||
| -rw-r--r-- | fs/pstore/platform.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c index 379a02dc1217..b3b426edb2fd 100644 --- a/fs/pstore/inode.c +++ b/fs/pstore/inode.c @@ -80,7 +80,8 @@ static int pstore_unlink(struct inode *dir, struct dentry *dentry) { 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); } diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c index f146d89179bf..9ec22d3b4293 100644 --- a/fs/pstore/platform.c +++ b/fs/pstore/platform.c @@ -207,8 +207,7 @@ void pstore_get_records(int quiet) return; mutex_lock(&psi->read_mutex); - rc = psi->open(psi); - if (rc) + if (psi->open && psi->open(psi)) goto out; while ((size = psi->read(&id, &type, &time, &buf, psi)) > 0) { @@ -219,7 +218,8 @@ void pstore_get_records(int quiet) if (rc && (rc != -EEXIST || !quiet)) failed++; } - psi->close(psi); + if (psi->close) + psi->close(psi); out: mutex_unlock(&psi->read_mutex); |