diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-05 12:16:18 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-05 12:16:18 -0500 |
commit | a65981109f294ba7e64b33ad3b4575a4636fce66 (patch) | |
tree | 1061a49f11544e18775630938a8bc53920fa0421 /fs/proc/inode.c | |
parent | 3fed6ae4b027f9c93be18520f87bd06bdffd196b (diff) | |
parent | b685a7350ae76bc0f388e24b36d06a63776c68ee (diff) |
Merge branch 'akpm' (patches from Andrew)
Merge more updates from Andrew Morton:
- procfs updates
- various misc bits
- lib/ updates
- epoll updates
- autofs
- fatfs
- a few more MM bits
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (58 commits)
mm/page_io.c: fix polled swap page in
checkpatch: add Co-developed-by to signature tags
docs: fix Co-Developed-by docs
drivers/base/platform.c: kmemleak ignore a known leak
fs: don't open code lru_to_page()
fs/: remove caller signal_pending branch predictions
mm/: remove caller signal_pending branch predictions
arch/arc/mm/fault.c: remove caller signal_pending_branch predictions
kernel/sched/: remove caller signal_pending branch predictions
kernel/locking/mutex.c: remove caller signal_pending branch predictions
mm: select HAVE_MOVE_PMD on x86 for faster mremap
mm: speed up mremap by 20x on large regions
mm: treewide: remove unused address argument from pte_alloc functions
initramfs: cleanup incomplete rootfs
scripts/gdb: fix lx-version string output
kernel/kcov.c: mark write_comp_data() as notrace
kernel/sysctl: add panic_print into sysctl
panic: add options to print system info when panic happens
bfs: extra sanity checking and static inode bitmap
exec: separate MM_ANONPAGES and RLIMIT_STACK accounting
...
Diffstat (limited to 'fs/proc/inode.c')
-rw-r--r-- | fs/proc/inode.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/proc/inode.c b/fs/proc/inode.c index 5792f9e39466..da649ccd6804 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c | |||
@@ -59,7 +59,6 @@ static struct kmem_cache *pde_opener_cache __ro_after_init; | |||
59 | static struct inode *proc_alloc_inode(struct super_block *sb) | 59 | static struct inode *proc_alloc_inode(struct super_block *sb) |
60 | { | 60 | { |
61 | struct proc_inode *ei; | 61 | struct proc_inode *ei; |
62 | struct inode *inode; | ||
63 | 62 | ||
64 | ei = kmem_cache_alloc(proc_inode_cachep, GFP_KERNEL); | 63 | ei = kmem_cache_alloc(proc_inode_cachep, GFP_KERNEL); |
65 | if (!ei) | 64 | if (!ei) |
@@ -71,8 +70,7 @@ static struct inode *proc_alloc_inode(struct super_block *sb) | |||
71 | ei->sysctl = NULL; | 70 | ei->sysctl = NULL; |
72 | ei->sysctl_entry = NULL; | 71 | ei->sysctl_entry = NULL; |
73 | ei->ns_ops = NULL; | 72 | ei->ns_ops = NULL; |
74 | inode = &ei->vfs_inode; | 73 | return &ei->vfs_inode; |
75 | return inode; | ||
76 | } | 74 | } |
77 | 75 | ||
78 | static void proc_i_callback(struct rcu_head *head) | 76 | static void proc_i_callback(struct rcu_head *head) |