diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-07 02:03:02 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-07 02:03:02 (GMT) |
| commit | 6ed23fd6c08b3ffa17c1f841098d2fa2ab3a59dd (patch) | |
| tree | 5cb5bb5dbefbb6458eff4bdae3c091ca3c02d685 /fs/pstore/inode.c | |
| parent | 5ee354a0295c34aa7da07be8490f86edee2c7883 (diff) | |
| parent | 2174f6df7891fa331800beb72634c969f017900b (diff) | |
| download | linux-fsl-qoriq-6ed23fd6c08b3ffa17c1f841098d2fa2ab3a59dd.tar.xz | |
Merge branch 'pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
* 'pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
pstore: gracefully handle NULL pstore_info functions
pstore: pass reason to backend write callback
Diffstat (limited to 'fs/pstore/inode.c')
| -rw-r--r-- | fs/pstore/inode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c index 379a02d..b3b426e 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); } |