From 1add9f7a56e43099c23f6ba9409278116ea1c964 Mon Sep 17 00:00:00 2001 From: James Morris Date: Mon, 2 Sep 2002 22:40:11 -0700 Subject: [PATCH] sigio/sigurg cleanup for 2.5.32 This is a cleanup of the sigio/sigurg code. Summary: o Removed sk->proc, SIGURG now sent via vfs, credentials checked during delivery. o SIOCSPGRP etc. ioctls use vfs, and work now for SIGIO as well as SIGURG. o Removed socket fcntl code. o Consolidate lsm file_set_fowner() hooks. o Fixed fowner race. o Fixed associated mainline memory leak in fcntl_dirnotify(). --- net/socket.c | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'net/socket.c') diff --git a/net/socket.c b/net/socket.c index 53dcf8bf9c83..e7a88dfcee6e 100644 --- a/net/socket.c +++ b/net/socket.c @@ -1516,24 +1516,6 @@ out: return err; } - -/* - * Perform a file control on a socket file descriptor. - * - * Doesn't acquire a fd lock, because no network fcntl - * function sleeps currently. - */ - -int sock_fcntl(struct file *filp, unsigned int cmd, unsigned long arg) -{ - struct socket *sock; - - sock = SOCKET_I (filp->f_dentry->d_inode); - if (sock && sock->ops) - return sock_no_fcntl(sock, cmd, arg); - return(-EINVAL); -} - /* Argument list sizes for sys_socketcall */ #define AL(x) ((x) * sizeof(unsigned long)) static unsigned char nargs[18]={AL(0),AL(3),AL(3),AL(3),AL(2),AL(3), -- cgit v1.2.3