Message ID | 1429073260-17470-1-git-send-email-mguzik@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
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;
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 <mguzik@redhat.com> --- fs/file.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)