* [PATCH] shmem: fix double memory uncharge on error path
@ 2013-09-12 13:46 Konstantin Khlebnikov
0 siblings, 0 replies; only message in thread
From: Konstantin Khlebnikov @ 2013-09-12 13:46 UTC (permalink / raw
To: Hugh Dickins; +Cc: linux-mm, linux-kernel
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 <khlebnikov@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);
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2013-09-12 13:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-12 13:46 [PATCH] shmem: fix double memory uncharge on error path Konstantin Khlebnikov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).