Ver Fonte

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>
Kees Cook há 13 anos atrás
pai
commit
2174f6df78
2 ficheiros alterados com 5 adições e 4 exclusões
  1. 2 1
      fs/pstore/inode.c
  2. 3 3
      fs/pstore/platform.c

+ 2 - 1
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;
 	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);
 }
 }

+ 3 - 3
fs/pstore/platform.c

@@ -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 (rc)
+	if (psi->open && psi->open(psi))
 		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)
 		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);