git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Bluetooth] Use ACL config stage to retrieve remote features
[pandora-kernel.git]
/
mm
/
tiny-shmem.c
diff --git
a/mm/tiny-shmem.c
b/mm/tiny-shmem.c
index
7020836
..
ae532f5
100644
(file)
--- a/
mm/tiny-shmem.c
+++ b/
mm/tiny-shmem.c
@@
-39,12
+39,11
@@
static int __init init_tmpfs(void)
}
module_init(init_tmpfs)
}
module_init(init_tmpfs)
-/*
+/*
*
* shmem_file_setup - get an unlinked file living in tmpfs
* shmem_file_setup - get an unlinked file living in tmpfs
- *
* @name: name for dentry (to be seen in /proc/<pid>/maps
* @size: size to be set for the file
* @name: name for dentry (to be seen in /proc/<pid>/maps
* @size: size to be set for the file
- *
+ *
@flags: vm_flags
*/
struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags)
{
*/
struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags)
{
@@
-89,15
+88,16
@@
struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags)
close_file:
put_filp(file);
close_file:
put_filp(file);
+ return ERR_PTR(error);
+
put_dentry:
dput(dentry);
put_memory:
return ERR_PTR(error);
}
put_dentry:
dput(dentry);
put_memory:
return ERR_PTR(error);
}
-/*
+/*
*
* shmem_zero_setup - setup a shared anonymous mapping
* shmem_zero_setup - setup a shared anonymous mapping
- *
* @vma: the vma to be mmapped is prepared by do_mmap_pgoff
*/
int shmem_zero_setup(struct vm_area_struct *vma)
* @vma: the vma to be mmapped is prepared by do_mmap_pgoff
*/
int shmem_zero_setup(struct vm_area_struct *vma)