[PATCH] fs/file.c: tidy up close_files

[Mateusz Guzik <mguzik@redhat.com>]

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 <mguzik@redhat.com>
---
 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