patch-2.4.25 linux-2.4.25/net/bluetooth/cmtp/sock.c

• Lines: 37
• Date: 2004-02-18 05:36:32.000000000 -0800
• Orig file: linux-2.4.24/net/bluetooth/cmtp/sock.c
• Orig date: 2003-08-25 04:44:44.000000000 -0700

diff -urN linux-2.4.24/net/bluetooth/cmtp/sock.c linux-2.4.25/net/bluetooth/cmtp/sock.c
@@ -47,36 +47,6 @@
 #define BT_DBG(D...)
 #endif
 
-static inline struct socket *socki_lookup(struct inode *inode)
-{
-	return &inode->u.socket_i;
-}
-
-static struct socket *sockfd_lookup(int fd, int *err)
-{
-	struct file *file;
-	struct inode *inode;
-	struct socket *sock;
-
-	if (!(file = fget(fd))) {
-		*err = -EBADF;
-		return NULL;
-	}
-
-	inode = file->f_dentry->d_inode;
-	if (!inode->i_sock || !(sock = socki_lookup(inode))) {
-		*err = -ENOTSOCK;
-		fput(file);
-		return NULL;
-	}
-
-	if (sock->file != file) {
-		printk(KERN_ERR "socki_lookup: socket file changed!\n");
-		sock->file = file;
-	}
-	return sock;
-}
-
 static int cmtp_sock_release(struct socket *sock)
 {
 	struct sock *sk = sock->sk;