From: "Darrick J. Wong" <darrick.wong@oracle.com> To: akpm@linux-foundation.org, ying.huang@intel.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] mm: kvfree the swap cluster info if the swap file is unsatisfactory Date: Thu, 31 Aug 2017 16:35:15 -0700 [thread overview] Message-ID: <20170831233515.GR3775@magnolia> (raw) If initializing a small swap file fails because the swap file has a problem (holes, etc.) then we need to free the cluster info as part of cleanup. Unfortunately a previous patch changed the code to use kvzalloc but did not change all the vfree calls to use kvfree. Found by running generic/357 from xfstests. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> --- mm/swapfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 6ba4aab..c1deb01 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -3052,7 +3052,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) p->flags = 0; spin_unlock(&swap_lock); vfree(swap_map); - vfree(cluster_info); + kvfree(cluster_info); if (swap_file) { if (inode && S_ISREG(inode->i_mode)) { inode_unlock(inode);
WARNING: multiple messages have this Message-ID (diff)
From: "Darrick J. Wong" <darrick.wong@oracle.com> To: akpm@linux-foundation.org, ying.huang@intel.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] mm: kvfree the swap cluster info if the swap file is unsatisfactory Date: Thu, 31 Aug 2017 16:35:15 -0700 [thread overview] Message-ID: <20170831233515.GR3775@magnolia> (raw) If initializing a small swap file fails because the swap file has a problem (holes, etc.) then we need to free the cluster info as part of cleanup. Unfortunately a previous patch changed the code to use kvzalloc but did not change all the vfree calls to use kvfree. Found by running generic/357 from xfstests. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> --- mm/swapfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 6ba4aab..c1deb01 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -3052,7 +3052,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) p->flags = 0; spin_unlock(&swap_lock); vfree(swap_map); - vfree(cluster_info); + kvfree(cluster_info); if (swap_file) { if (inode && S_ISREG(inode->i_mode)) { inode_unlock(inode); -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next reply other threads:[~2017-08-31 23:35 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-08-31 23:35 Darrick J. Wong [this message] 2017-08-31 23:35 ` [PATCH] mm: kvfree the swap cluster info if the swap file is unsatisfactory Darrick J. Wong 2017-08-31 23:41 ` taskboxtester 2017-09-01 1:33 ` Huang, Ying 2017-09-01 1:33 ` Huang, Ying 2017-09-01 8:33 ` David Rientjes 2017-09-01 8:33 ` David Rientjes 2017-09-04 0:58 ` Huang, Ying 2017-09-04 0:58 ` Huang, Ying
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170831233515.GR3775@magnolia \ --to=darrick.wong@oracle.com \ --cc=akpm@linux-foundation.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=ying.huang@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.