fs: Use RCU_INIT_POINTER(x, NULL) in file.c
PATCH 1/1 fs: Use RCU_INIT_POINTER(x, NULL) in file.c
This patch replaces rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x, NULL)
The rcu_assign_pointer() ensures that the initialization of a structure is carried out before storing a pointer to that structure.
And in the case of the NULL pointer, there is no structure to initialize. So, rcu_assign_pointer(p, NULL) can be safely converted to RCU_INIT_POINTER(p, NULL)
Signed-off-by Monam Agarwal <[email protected]>
--- fs/file.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/file.c +3 -3
@@ -499,7 +499,7 @@ repeat:/* Sanity check */ if (rcu_dereference_raw (fdt->fd[fd]) !=NULL ) {printk (KERN_WARNING "alloc_fd: slot %d not NULL!\n" , fd); -rcu_assign_pointer (fdt->fd[fd],NULL ); +RCU_INIT_POINTER (fdt->fd[fd],NULL ); }#endif
@@ -590,7 +590,7 @@ int __close_fd(struct files_struct *files, unsigned fd) file = fdt->fd[fd];if (!file) goto out_unlock; -rcu_assign_pointer (fdt->fd[fd],NULL ); +RCU_INIT_POINTER (fdt->fd[fd],NULL );__clear_close_on_exec (fd, fdt);__put_unused_fd (files, fd);spin_unlock (&files->file_lock);
@@ -625,7 +625,7 @@ void do_close_on_exec(struct files_struct *files) file = fdt->fd[fd];if (!file)continue ; -rcu_assign_pointer (fdt->fd[fd],NULL ); +RCU_INIT_POINTER (fdt->fd[fd],NULL );__put_unused_fd (files, fd);spin_unlock (&files->file_lock);filp_close (file, files);
Signature · 1 line
1.7.9.5