This patch removes erroneous call of shmem_unacct_size() from error path.
Shmem inode will release that memory reservation in shmem_evict_inode().
So, if following call of alloc_file fails we'll free reservation twice.
Signed-off-by: Konstantin Khlebnikov <khlebni...@openvz.org>
---
mm/shmem.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/mm/shmem.c b/mm/shmem.c
index 8297623..ff08920 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2946,16 +2946,16 @@ struct file *shmem_file_setup(const char *name, loff_t
size, unsigned long flags
this.len = strlen(name);
this.hash = 0; /* will go */
sb = shm_mnt->mnt_sb;
+ path.mnt = mntget(shm_mnt);
path.dentry = d_alloc_pseudo(sb, &this);
if (!path.dentry)
goto put_memory;
d_set_d_op(path.dentry, &anon_ops);
- path.mnt = mntget(shm_mnt);
res = ERR_PTR(-ENOSPC);
inode = shmem_get_inode(sb, NULL, S_IFREG | S_IRWXUGO, 0, flags);
if (!inode)
- goto put_dentry;
+ goto put_memory;
d_instantiate(path.dentry, inode);
inode->i_size = size;
@@ -2971,10 +2971,10 @@ struct file *shmem_file_setup(const char *name, loff_t
size, unsigned long flags
return res;
-put_dentry:
- path_put(&path);
put_memory:
shmem_unacct_size(flags, size);
+put_dentry:
+ path_put(&path);
return res;
}
EXPORT_SYMBOL_GPL(shmem_file_setup);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
