From: Ran Xiaokai <ran.xiaokai@xxxxxxxxxx> Subject: kernel/fork.c: unshare(): use swap() to make code cleaner Use swap() instead of reimplementing it. Link: https://lkml.kernel.org/r/20210909022046.8151-1-ran.xiaokai@xxxxxxxxxx Signed-off-by: Ran Xiaokai <ran.xiaokai@xxxxxxxxxx> Cc: Gabriel Krisman Bertazi <krisman@xxxxxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Eric W. Biederman <ebiederm@xxxxxxxxxxxx> Cc: Jens Axboe <axboe@xxxxxxxxx> Cc: Alexey Gladkov <legion@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/fork.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) --- a/kernel/fork.c~unshare-use-swap-to-make-code-cleaner +++ a/kernel/fork.c @@ -3027,7 +3027,7 @@ int unshare_fd(unsigned long unshare_fla int ksys_unshare(unsigned long unshare_flags) { struct fs_struct *fs, *new_fs = NULL; - struct files_struct *fd, *new_fd = NULL; + struct files_struct *new_fd = NULL; struct cred *new_cred = NULL; struct nsproxy *new_nsproxy = NULL; int do_sysvsem = 0; @@ -3114,11 +3114,8 @@ int ksys_unshare(unsigned long unshare_f spin_unlock(&fs->lock); } - if (new_fd) { - fd = current->files; - current->files = new_fd; - new_fd = fd; - } + if (new_fd) + swap(current->files, new_fd); task_unlock(current); _
