aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds2013-03-03 15:23:02 -0600
committerLinus Torvalds2013-03-03 15:23:03 -0600
commit56a79b7b021bf1b08334e63c2c14b280e2dbf47a (patch)
tree0419233e6194f4f12073c9284852885aa8984bec /mm
parent1c82315a12144cde732636e259d39e3ee81b3c5b (diff)
parentdcf787f39162ce32ca325b3e784aba2d2444619a (diff)
downloadam43-linux-kernel-56a79b7b021bf1b08334e63c2c14b280e2dbf47a.tar.gz
am43-linux-kernel-56a79b7b021bf1b08334e63c2c14b280e2dbf47a.tar.xz
am43-linux-kernel-56a79b7b021bf1b08334e63c2c14b280e2dbf47a.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull more VFS bits from Al Viro: "Unfortunately, it looks like xattr series will have to wait until the next cycle ;-/ This pile contains 9p cleanups and fixes (races in v9fs_fid_add() etc), fixup for nommu breakage in shmem.c, several cleanups and a bit more file_inode() work" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: constify path_get/path_put and fs_struct.c stuff fix nommu breakage in shmem.c cache the value of file_inode() in struct file 9p: if v9fs_fid_lookup() gets to asking server, it'd better have hashed dentry 9p: make sure ->lookup() adds fid to the right dentry 9p: untangle ->lookup() a bit 9p: double iput() in ->lookup() if d_materialise_unique() fails 9p: v9fs_fid_add() can't fail now v9fs: get rid of v9fs_dentry 9p: turn fid->dlist into hlist 9p: don't bother with private lock in ->d_fsdata; dentry->d_lock will do just fine more file_inode() open-coded instances selinux: opened file can't have NULL or negative ->f_path.dentry (In the meantime, the hlist traversal macros have changed, so this required a semantic conflict fixup for the newly hlistified fid->dlist)
Diffstat (limited to 'mm')
-rw-r--r--mm/shmem.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/mm/shmem.c b/mm/shmem.c
index ed2befb4952..1c44af71fcf 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2932,9 +2932,8 @@ struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags
2932 inode->i_size = size; 2932 inode->i_size = size;
2933 clear_nlink(inode); /* It is unlinked */ 2933 clear_nlink(inode); /* It is unlinked */
2934#ifndef CONFIG_MMU 2934#ifndef CONFIG_MMU
2935 error = ramfs_nommu_expand_for_mapping(inode, size); 2935 res = ERR_PTR(ramfs_nommu_expand_for_mapping(inode, size));
2936 res = ERR_PTR(error); 2936 if (IS_ERR(res))
2937 if (error)
2938 goto put_dentry; 2937 goto put_dentry;
2939#endif 2938#endif
2940 2939