diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-15 16:03:15 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-15 16:03:15 (GMT) |
| commit | 3f8bf8f0fd79410fbcbf9dd9910dbc9d4882c94f (patch) | |
| tree | 86792764365ca7b40a21e5eb8fc4f7b355088535 /fs/sysv/dir.c | |
| parent | c28f3f8660697d03afbdb581781b94ff6222a585 (diff) | |
| parent | 684bdc7ff95e0c1d4b0bcf236491840b55a54189 (diff) | |
| download | linux-fsl-qoriq-3f8bf8f0fd79410fbcbf9dd9910dbc9d4882c94f.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
JFS: Free sbi memory in error path
fs/sysv: dereferencing ERR_PTR()
Fix double-free in logfs
Fix the regression created by "set S_DEAD on unlink()..." commit
Diffstat (limited to 'fs/sysv/dir.c')
| -rw-r--r-- | fs/sysv/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/sysv/dir.c b/fs/sysv/dir.c index 4e50286..1dabed2 100644 --- a/fs/sysv/dir.c +++ b/fs/sysv/dir.c @@ -164,8 +164,8 @@ struct sysv_dir_entry *sysv_find_entry(struct dentry *dentry, struct page **res_ name, de->name)) goto found; } + dir_put_page(page); } - dir_put_page(page); if (++n >= npages) n = 0; |