aboutsummaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-03-25 08:57:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-03-25 08:57:47 -0700
commit7ed7fe5e82c9fc8473974fbd7389d169b8f17c77 (patch)
treeff6ff57c88c887133f1585473e7d74981d0dc88c /mm
parenta4083c9271e0a697278e089f2c0b9a95363ada0a (diff)
parenta02f76c34d7d6d30b63ac64a8b34dea68593e8da (diff)
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: [PATCH] get stack footprint of pathname resolution back to relative sanity [PATCH] double iput() on failure exit in hugetlb [PATCH] double dput() on failure exit in tiny-shmem [PATCH] fix up new filp allocators [PATCH] check for null vfsmount in dentry_open() [PATCH] reiserfs: eliminate private use of struct file in xattr [PATCH] sanitize hppfs hppfs pass vfsmount to dentry_open() [PATCH] restore export of do_kern_mount()
Diffstat (limited to 'mm')
-rw-r--r--mm/tiny-shmem.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/tiny-shmem.c b/mm/tiny-shmem.c
index f0f55875dd6..ae532f50194 100644
--- a/mm/tiny-shmem.c
+++ b/mm/tiny-shmem.c
@@ -88,6 +88,8 @@ struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags)
close_file:
put_filp(file);
+ return ERR_PTR(error);
+
put_dentry:
dput(dentry);
put_memory: