From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mateusz Guzik Subject: [PATCH] fs/file.c: remove useless xchg and NULL check in close_files Date: Wed, 15 Apr 2015 06:47:40 +0200 Message-ID: <1429073260-17470-1-git-send-email-mguzik@redhat.com> Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org To: Alexander Viro Return-path: Received: from mx1.redhat.com ([209.132.183.28]:51205 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752054AbbDOErp (ORCPT ); Wed, 15 Apr 2015 00:47:45 -0400 Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Since the table is about to be freed, there is no reason to set file pointer to NULL on closing. At this point open_fd map is supposed to indicate whether a file is installed, so NULL-checking it is unnecessary. Signed-off-by: Mateusz Guzik --- fs/file.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/fs/file.c b/fs/file.c index 93c5f89..35a024a 100644 --- a/fs/file.c +++ b/fs/file.c @@ -364,11 +364,8 @@ static struct fdtable *close_files(struct files_struct * files) set = fdt->open_fds[j++]; while (set) { if (set & 1) { - struct file * file = xchg(&fdt->fd[i], NULL); - if (file) { - filp_close(file, files); - cond_resched_rcu_qs(); - } + filp_close(fdt->fd[i], files); + cond_resched_rcu_qs(); } i++; set >>= 1; -- 1.8.3.1