X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Flnet%2Flib-socket.c;h=7d0dcbd1bcb0075f7a75cd05a9b7b6c321341edb;hb=f4e3a8239c520606032aa38f7c114cd9600385f3;hp=5348ac0442cae08b60c61d84f31d8003d438139c;hpb=87fe2c045ff07cadb3c2034618254a6acfe53180;p=fs%2Flustre-release.git diff --git a/lnet/lnet/lib-socket.c b/lnet/lnet/lib-socket.c index 5348ac0..7d0dcbd 100644 --- a/lnet/lnet/lib-socket.c +++ b/lnet/lnet/lib-socket.c @@ -15,11 +15,7 @@ * * 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. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ @@ -27,7 +23,7 @@ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2012, 2014, Intel Corporation. + * Copyright (c) 2015, 2016, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -35,9 +31,6 @@ */ #define DEBUG_SUBSYSTEM S_LNET -#ifdef HAVE_COMPAT_RDMA -#include -#endif #include #include #include @@ -205,9 +198,9 @@ lnet_ipif_enumerate(char ***namesp) nalloc = 16; /* first guess at max interfaces */ toobig = 0; for (;;) { - if (nalloc * sizeof(*ifr) > PAGE_CACHE_SIZE) { + if (nalloc * sizeof(*ifr) > PAGE_SIZE) { toobig = 1; - nalloc = PAGE_CACHE_SIZE/sizeof(*ifr); + nalloc = PAGE_SIZE / sizeof(*ifr); CWARN("Too many interfaces: only enumerating " "first %d\n", nalloc); }