diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/mbcache.c | 2 | ||||
-rw-r--r-- | fs/proc/proc_sysctl.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/fs/mbcache.c b/fs/mbcache.c index 1046cbefbfbf..eb31b73e7d69 100644 --- a/fs/mbcache.c +++ b/fs/mbcache.c | |||
@@ -403,9 +403,9 @@ mb_cache_entry_alloc(struct mb_cache *cache) | |||
403 | { | 403 | { |
404 | struct mb_cache_entry *ce; | 404 | struct mb_cache_entry *ce; |
405 | 405 | ||
406 | atomic_inc(&cache->c_entry_count); | ||
407 | ce = kmem_cache_alloc(cache->c_entry_cache, GFP_KERNEL); | 406 | ce = kmem_cache_alloc(cache->c_entry_cache, GFP_KERNEL); |
408 | if (ce) { | 407 | if (ce) { |
408 | atomic_inc(&cache->c_entry_count); | ||
409 | INIT_LIST_HEAD(&ce->e_lru_list); | 409 | INIT_LIST_HEAD(&ce->e_lru_list); |
410 | INIT_LIST_HEAD(&ce->e_block_list); | 410 | INIT_LIST_HEAD(&ce->e_block_list); |
411 | ce->e_cache = cache; | 411 | ce->e_cache = cache; |
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index 680c429bfa22..4e57fcf85982 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c | |||
@@ -171,7 +171,8 @@ static ssize_t proc_sys_read(struct file *filp, char __user *buf, | |||
171 | struct dentry *dentry = filp->f_dentry; | 171 | struct dentry *dentry = filp->f_dentry; |
172 | struct ctl_table_header *head; | 172 | struct ctl_table_header *head; |
173 | struct ctl_table *table; | 173 | struct ctl_table *table; |
174 | ssize_t error, res; | 174 | ssize_t error; |
175 | size_t res; | ||
175 | 176 | ||
176 | table = do_proc_sys_lookup(dentry->d_parent, &dentry->d_name, &head); | 177 | table = do_proc_sys_lookup(dentry->d_parent, &dentry->d_name, &head); |
177 | /* Has the sysctl entry disappeared on us? */ | 178 | /* Has the sysctl entry disappeared on us? */ |
@@ -209,7 +210,8 @@ static ssize_t proc_sys_write(struct file *filp, const char __user *buf, | |||
209 | struct dentry *dentry = filp->f_dentry; | 210 | struct dentry *dentry = filp->f_dentry; |
210 | struct ctl_table_header *head; | 211 | struct ctl_table_header *head; |
211 | struct ctl_table *table; | 212 | struct ctl_table *table; |
212 | ssize_t error, res; | 213 | ssize_t error; |
214 | size_t res; | ||
213 | 215 | ||
214 | table = do_proc_sys_lookup(dentry->d_parent, &dentry->d_name, &head); | 216 | table = do_proc_sys_lookup(dentry->d_parent, &dentry->d_name, &head); |
215 | /* Has the sysctl entry disappeared on us? */ | 217 | /* Has the sysctl entry disappeared on us? */ |