LU-1346 libcfs: remove cfs_ file wrappers

[fs/lustre-release.git] / libcfs / include / libcfs / linux / linux-tcpip.h

diff --git a/libcfs/include/libcfs/linux/linux-tcpip.h b/libcfs/include/libcfs/linux/linux-tcpip.h
index 48bef31..b358773 100644 (file)
--- a/libcfs/include/libcfs/linux/linux-tcpip.h
+++ b/libcfs/include/libcfs/linux/linux-tcpip.h
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,7 +27,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Whamcloud, Inc.
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -86,10 +84,12 @@ libcfs_sock_wmem_queued(struct socket *sock)
 }
 
 #ifndef HAVE_SK_SLEEP
-static inline wait_queue_head_t *sk_sleep(struct sock *sk)
+static inline wait_queue_head_t *cfs_sk_sleep(struct sock *sk)
 {
         return sk->sk_sleep;
 }
+#else
+#define cfs_sk_sleep(sk)       sk_sleep(sk)
 #endif
 
 #ifdef HAVE_INIT_NET