|
From: Fred W. <fw...@us...> - 2006-01-24 04:40:43
|
Update of /cvsroot/linux-abi/linux-abi/linux-26/abi/svr4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2468/linux-26/abi/svr4 Modified Files: filio.c ipc.c signal.c sockio.c socksys.c Log Message: linux-26: patch to 2.6.14, incl. audit syscalls Index: filio.c =================================================================== RCS file: /cvsroot/linux-abi/linux-abi/linux-26/abi/svr4/filio.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** filio.c 23 Jan 2006 22:55:45 -0000 1.2 --- filio.c 24 Jan 2006 04:40:17 -0000 1.3 *************** *** 39,47 **** svr4_fil_ioctl(int fd, u_int cmd, caddr_t data) { switch (cmd) { /* FIOCLEX */ case BSD__IOV('f', 1): case BSD__IO('f', 1): ! FD_SET(fd, current->files->close_on_exec); return 0; --- 39,51 ---- svr4_fil_ioctl(int fd, u_int cmd, caddr_t data) { + + struct fdtable *fdt; + fdt = files_fdtable(current->files); + switch (cmd) { /* FIOCLEX */ case BSD__IOV('f', 1): case BSD__IO('f', 1): ! FD_SET(fd, fdt->close_on_exec); return 0; *************** *** 49,53 **** case BSD__IOV('f', 2): case BSD__IO('f', 2): ! FD_CLR(fd, current->files->close_on_exec); return 0; --- 53,57 ---- case BSD__IOV('f', 2): case BSD__IO('f', 2): ! FD_CLR(fd, fdt->close_on_exec); return 0; Index: ipc.c =================================================================== RCS file: /cvsroot/linux-abi/linux-abi/linux-26/abi/svr4/ipc.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** ipc.c 24 Jan 2006 00:28:19 -0000 1.3 --- ipc.c 24 Jan 2006 04:40:17 -0000 1.4 *************** *** 58,64 **** #include <linux/msg.h> - extern asmlinkage int sys_ipc(uint call, int first, int second, - int third, void *ptr, long fifth); - #include <asm/uaccess.h> #include <asm/ipc.h> --- 58,61 ---- Index: signal.c =================================================================== RCS file: /cvsroot/linux-abi/linux-abi/linux-26/abi/svr4/signal.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** signal.c 24 Jan 2006 00:28:19 -0000 1.3 --- signal.c 24 Jan 2006 04:40:17 -0000 1.4 *************** *** 31,41 **** #include <linux/syscalls.h> - asmlinkage long sys_rt_sigaction(int sig, - const struct sigaction __user *act, - struct sigaction __user *oact, - size_t sigsetsize); - extern asmlinkage int sys_sigsuspend(int history0, int history1, - old_sigset_t mask); - #include <asm/system.h> #include <asm/uaccess.h> --- 31,34 ---- Index: sockio.c =================================================================== RCS file: /cvsroot/linux-abi/linux-abi/linux-26/abi/svr4/sockio.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** sockio.c 24 Jan 2006 00:28:19 -0000 1.3 --- sockio.c 24 Jan 2006 04:40:17 -0000 1.4 *************** *** 37,41 **** goto fput; - #if defined(CONFIG_ABI_XTI) if (S_ISSOCK(ip->i_mode)) { struct T_private *ti = Priv(fp); --- 37,40 ---- *************** *** 50,54 **** } } ! #endif fput(fp); --- 49,53 ---- } } ! fput(fp); *************** *** 83,87 **** error = 0; ! if (!S_ISSOCK(ip->i_mode)) goto fput; --- 82,86 ---- error = 0; ! if (!S_ISSOCK(ip->i_mode)) goto fput; Index: socksys.c =================================================================== RCS file: /cvsroot/linux-abi/linux-abi/linux-26/abi/svr4/socksys.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** socksys.c 24 Jan 2006 00:28:19 -0000 1.3 --- socksys.c 24 Jan 2006 04:40:17 -0000 1.4 *************** *** 407,411 **** * just the pseudo device transport provider. */ ! if (!ip || !S_ISSOCK(ip->i_mode)) goto out; if (fp->private_data) { --- 407,412 ---- * just the pseudo device transport provider. */ ! if (!ip || !S_ISSOCK(ip->i_mode)) ! goto out; if (fp->private_data) { *************** *** 455,463 **** { int fd, error; ! /* ! if (fp->f_dentry->d_inode->i_sock) BUG(); ! */ ! for (fd = 0; fd < current->files->max_fdset; fd++) { if (fcheck(fd) == fp) { error = socksys_fdinit(fd, 0, NULL, NULL); --- 456,467 ---- { int fd, error; ! struct fdtable *fdt; ! fdt = files_fdtable(current->files); ! ! ! if (S_ISSOCK(fp->f_dentry->d_inode->i_mode)) BUG(); ! ! for (fd = 0; fd < fdt->max_fdset; fd++) { if (fcheck(fd) == fp) { error = socksys_fdinit(fd, 0, NULL, NULL); *************** *** 477,485 **** { int fd, error; ! /* ! if (fp->f_dentry->d_inode->i_sock) BUG(); ! */ ! for (fd = 0; fd < current->files->max_fdset; fd++) { if (fcheck(fd) == fp) { error = socksys_fdinit(fd, 1, buf, &count); --- 481,491 ---- { int fd, error; ! struct fdtable *fdt; ! fdt = files_fdtable(current->files); ! ! if (S_ISSOCK(fp->f_dentry->d_inode->i_mode)) BUG(); ! ! for (fd = 0; fd < fdt->max_fdset; fd++) { if (fcheck(fd) == fp) { error = socksys_fdinit(fd, 1, buf, &count); |