From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754857AbbJHSIN (ORCPT ); Thu, 8 Oct 2015 14:08:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35125 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754039AbbJHSIL (ORCPT ); Thu, 8 Oct 2015 14:08:11 -0400 From: Mateusz Guzik To: Alexander Viro Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Eric Dumazet Subject: [PATCH] fs/file.c: tidy up close_files Date: Thu, 8 Oct 2015 20:08:07 +0200 Message-Id: <1444327687-2923-1-git-send-email-mguzik@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Improve consistency by reorganizing the code to use the same constructs as do_close_on_exec. Get rid of xchg of the file pointer. Since the table is about to be freed there is no reason to NULLify the slot. Get rid of the file NULL check. At this stage a bit set is supposed to guarantee the slot is populated. Signed-off-by: Mateusz Guzik --- fs/file.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/fs/file.c b/fs/file.c index 6c672ad..103d931 100644 --- a/fs/file.c +++ b/fs/file.c @@ -365,7 +365,7 @@ out: return NULL; } -static struct fdtable *close_files(struct files_struct * files) +static struct fdtable *close_files(struct files_struct *files) { /* * It is safe to dereference the fd table without RCU or @@ -373,24 +373,19 @@ static struct fdtable *close_files(struct files_struct * files) * files structure. */ struct fdtable *fdt = rcu_dereference_raw(files->fdt); - int i, j = 0; + unsigned i; - for (;;) { + for (i = 0; ; i++) { unsigned long set; - i = j * BITS_PER_LONG; - if (i >= fdt->max_fds) + unsigned fd = i * BITS_PER_LONG; + if (fd >= fdt->max_fds) break; - 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(); - } - } - i++; - set >>= 1; + set = fdt->open_fds[i]; + for ( ; set ; fd++, set >>= 1) { + if (!(set & 1)) + continue; + filp_close(fdt->fd[fd], files); + cond_resched_rcu_qs(); } } -- 1.8.3.1