diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-12 00:01:03 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-12 00:01:03 -0700 |
commit | fb4a1539948678b581bf12356f13e616397a458e (patch) | |
tree | 3c7389d5acdc5dfdff010aa5fa914cdaa9044d5a /drivers/staging/lustre/include | |
parent | staging: lustre: linux-tcpip.h: remove unused macros (diff) | |
download | linux-dev-fb4a1539948678b581bf12356f13e616397a458e.tar.xz linux-dev-fb4a1539948678b581bf12356f13e616397a458e.zip |
staging: lustre: remove linux-tcpip.h
There were just a few macros being used, remove them and have the places
where they were being used to make the proper kernel api call instead.
Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: hpdd-discuss <hpdd-discuss@lists.01.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/include')
-rw-r--r-- | drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h | 2 | ||||
-rw-r--r-- | drivers/staging/lustre/include/linux/libcfs/linux/linux-tcpip.h | 66 |
2 files changed, 1 insertions, 67 deletions
diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h b/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h index c4343fa890e4..1c06bf1dc3d0 100644 --- a/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h +++ b/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h @@ -45,12 +45,12 @@ #include <linux/bitops.h> #include <linux/mutex.h> #include <linux/types.h> +#include <net/sock.h> #include <stdarg.h> #include "linux-cpu.h" #include "linux-time.h" #include "linux-mem.h" #include "linux-prim.h" -#include "linux-tcpip.h" #include "kp30.h" #include <asm/types.h> diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-tcpip.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-tcpip.h deleted file mode 100644 index 441537abec4a..000000000000 --- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-tcpip.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 only, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License version 2 for more details (a copy is included - * in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - * GPL HEADER END - */ -/* - * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - * - * Copyright (c) 2012, Intel Corporation. - */ -/* - * This file is part of Lustre, http://www.lustre.org/ - * Lustre is a trademark of Sun Microsystems, Inc. - * - * libcfs/include/libcfs/linux/linux-tcpip.h - * - * Basic library routines. - */ - -#ifndef __LIBCFS_LINUX_CFS_TCP_H__ -#define __LIBCFS_LINUX_CFS_TCP_H__ - -#ifndef __LIBCFS_LIBCFS_H__ -#error Do not #include this file directly. #include <linux/libcfs/libcfs.h> instead -#endif - -#include <net/sock.h> - -#define SOCK_TEST_NOSPACE(so) test_bit(SOCK_NOSPACE, &(so)->flags) - -static inline int -cfs_sock_error(struct socket *sock) -{ - return sock->sk->sk_err; -} - -static inline int -cfs_sock_wmem_queued(struct socket *sock) -{ - return sock->sk->sk_wmem_queued; -} - -#define cfs_sk_sleep(sk) sk_sleep(sk) - -#endif |