From 0ef4c774146d07241446d92914232e2db2a5fd19 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Mon, 15 Mar 2021 17:47:37 +0800 Subject: [PATCH] mm/swapfile.c: fix a comment in sys_swapon() mainline inclusion from mainline-5.6-rc3 commit fed98ef4d8b665316479dd35cbd92d3e2ff470a3 category: bugfix bugzilla: 50612 CVE: NA --------------------------- claim_swapfile now always takes i_rwsem. Link: http://lkml.kernel.org/r/20200114161225.309792-2-hch@lst.de Signed-off-by: Christoph Hellwig Reviewed-by: Andrew Morton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: zhangyi (F) Reviewed-by: Yang Erkun Signed-off-by: Yang Yingliang Signed-off-by: Cheng Jian --- mm/swapfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index c03de4f1ee77..074a724df169 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -3259,7 +3259,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) mapping = swap_file->f_mapping; inode = mapping->host; - /* If S_ISREG(inode->i_mode) will do inode_lock(inode); */ + /* will take i_rwsem; */ error = claim_swapfile(p, inode); if (unlikely(error)) goto bad_swap; -- GitLab