---

yaml --- r: 279759 b: refs/heads/master c: 2174f6d h: refs/heads/master i: 279757: e21c9ce 279755: 15590b1 279751: 8e08cff 279743: 2333ede v: v3
git-mirror · Nov 18, 2011 · 9ae14e8 · 9ae14e8
1 parent 195a351
commit 9ae14e8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d6d8d20ec4fd3b256632edb373a9c504724b8a9
+refs/heads/master: 2174f6df7891fa331800beb72634c969f017900b
diff --git a/trunk/fs/pstore/inode.c b/trunk/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/trunk/fs/pstore/platform.c b/trunk/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);