mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 02:27:36 +03:00
Linux 3.4 compat, __clear_close_on_exec replaces FD_CLR
torvalds/linux@1dce27c5aa introduced __clear_close_on_exec() as a replacement for FD_CLR. Further commits appear to have removed FD_CLR from the Linux source tree. This causes the following failure: error: implicit declaration of function '__FD_CLR' [-Werror=implicit-function-declaration] To correct this we update the code to use the current __clear_close_on_exec() interface for readability. Then we introduce an autotools check to determine if __clear_close_on_exec() is available. If it isn't then we define some compatibility logic which used the older FD_CLR() interface. Signed-off-by: Richard Yao <ryao@gentoo.org> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes #124
This commit is contained in:
committed by
Brian Behlendorf
parent
eaac9ba510
commit
e0093fea58
@@ -414,7 +414,7 @@ fd_uninstall(int fd)
|
||||
goto out_unlock;
|
||||
|
||||
rcu_assign_pointer(fdt->fd[fd], NULL);
|
||||
FD_CLR(fd, fdt->close_on_exec);
|
||||
__clear_close_on_exec(fd, fdt);
|
||||
#else
|
||||
spin_lock(&files->file_lock);
|
||||
if (fd >= files->max_fds)
|
||||
|
||||
Reference in New Issue
Block a user