From patchwork Sat Jun 6 19:08:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Seewald X-Patchwork-Id: 11591351 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D31EB913 for ; Sat, 6 Jun 2020 19:33:36 +0000 (UTC) Received: from userp2120.oracle.com (userp2120.oracle.com [156.151.31.85]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A6CA42067B for ; Sat, 6 Jun 2020 19:33:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A6CA42067B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=ocfs2-devel-bounces@oss.oracle.com Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 056JSK6g025498; Sat, 6 Jun 2020 19:33:08 GMT Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by userp2120.oracle.com with ESMTP id 31g3smhmr1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Sat, 06 Jun 2020 19:33:07 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 056JRklW100748; Sat, 6 Jun 2020 19:33:07 GMT Received: from oss.oracle.com (oss-old-reserved.oracle.com [137.254.22.2]) by userp3030.oracle.com with ESMTP id 31g08r72c4-1 (version=TLSv1 cipher=AES256-SHA bits=256 verify=NO); Sat, 06 Jun 2020 19:33:06 +0000 Received: from localhost ([127.0.0.1] helo=lb-oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1jheZ0-0005kb-0M; Sat, 06 Jun 2020 12:33:06 -0700 Received: from aserp3030.oracle.com ([141.146.126.71]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1jheCn-0004Rf-LG for ocfs2-devel@oss.oracle.com; Sat, 06 Jun 2020 12:10:09 -0700 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 056J7eH3004995 for ; Sat, 6 Jun 2020 19:10:09 GMT Received: from userp2030.oracle.com (userp2030.oracle.com [156.151.31.89]) by aserp3030.oracle.com with ESMTP id 31g169c452-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sat, 06 Jun 2020 19:10:09 +0000 Received: from pps.filterd (userp2030.oracle.com [127.0.0.1]) by userp2030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 056J1rHo007562 for ; Sat, 6 Jun 2020 19:10:08 GMT Received: from mail-ot1-f65.google.com (mail-ot1-f65.google.com [209.85.210.65]) by userp2030.oracle.com with ESMTP id 31g16guyxf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=OK) for ; Sat, 06 Jun 2020 19:10:08 +0000 Received: by mail-ot1-f65.google.com with SMTP id t6so1179183otk.9 for ; Sat, 06 Jun 2020 12:10:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=cTw5dVSMwgnbi7FFVWG6b2nkWHLOFqVz8oS6c47Yp3w=; b=TeoFaJvhPEwl0FH5xkE3JYMJbt3ABTIiHJ7/yx81ldW7VK8tDRWSr+cQU9fvoYAzrM DLcgMeY20vYDdSuHKdjQsF/ocdONFNc/7pHM+esaWkoWul5UzuGQAJBuSEBnISJc1Chd Vd8jo3zUpa8vcrZb8DZPBVVBWOYhenv8+lk35kJAp1AXV+x+0GEcmI7604QOtR9XNvs5 2jm2T5ylv1AxevxxmJ3RT2vOToehgGSeyq64VR0yMLHvrrbjWojhQBLnXZclGD4WcJHW mQXWi7bxrxk/ww4e2sTwhDukjAzbJDpAMzt+UeF0DkwceTikdrGQGCa/O7tTdenhhIbr dB5g== X-Gm-Message-State: AOAM53138vffowiae0bo9dVaToCigJwYmM31tWI60bLtiwLwS/80yaYY vcJ4X3DRmM6JovBNCn+uNAI= X-Google-Smtp-Source: ABdhPJy61MvJ4C7cH913G/3NwYmTMNxge9YrVXCAqiNk6ZiFMinuObbHq0uWZE5pIaIty5cGQOmycA== X-Received: by 2002:a9d:d83:: with SMTP id 3mr11719097ots.365.1591470606991; Sat, 06 Jun 2020 12:10:06 -0700 (PDT) Received: from proxmox.local.lan ([2605:6000:1b0c:4825:226:b9ff:fe41:ba6b]) by smtp.googlemail.com with ESMTPSA id m83sm1397207oig.51.2020.06.06.12.10.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Jun 2020 12:10:06 -0700 (PDT) From: Tom Seewald To: linux-kernel@vger.kernel.org Date: Sat, 6 Jun 2020 14:08:26 -0500 Message-Id: <20200606190827.23954-1-tseewald@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-PDR: PASS X-Source-IP: 209.85.210.65 X-ServerName: mail-ot1-f65.google.com X-Proofpoint-SPF-Result: pass X-Proofpoint-SPF-Record: v=spf1 redirect=_spf.google.com X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9644 signatures=668680 X-Proofpoint-Spam-Details: rule=tap_notspam policy=tap score=0 phishscore=0 suspectscore=1 lowpriorityscore=0 impostorscore=0 mlxscore=0 bulkscore=0 cotscore=-2147483648 clxscore=309 spamscore=0 priorityscore=355 adultscore=0 mlxlogscore=826 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2004280000 definitions=main-2006060150 X-Spam: Clean X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 bulkscore=0 malwarescore=0 mlxscore=0 suspectscore=1 adultscore=0 phishscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2004280000 definitions=main-2006060152 X-Mailman-Approved-At: Sat, 06 Jun 2020 12:33:05 -0700 Cc: netdev@vger.kernel.org, tseewald@gmail.com, ocfs2-devel@oss.oracle.com Subject: [Ocfs2-devel] [PATCH] Fix build failure of OCFS2 when TCP/IP is disabled X-BeenThere: ocfs2-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ocfs2-devel-bounces@oss.oracle.com Errors-To: ocfs2-devel-bounces@oss.oracle.com X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9644 signatures=668680 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 suspectscore=0 bulkscore=0 adultscore=0 spamscore=0 malwarescore=0 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2004280000 definitions=main-2006060155 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9644 signatures=668680 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 priorityscore=1501 lowpriorityscore=0 impostorscore=0 cotscore=-2147483648 suspectscore=0 spamscore=0 bulkscore=0 malwarescore=0 phishscore=0 mlxscore=0 mlxlogscore=999 clxscore=1034 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2004280000 definitions=main-2006060155 After commit 12abc5ee7873 ("tcp: add tcp_sock_set_nodelay") and commit c488aeadcbd0 ("tcp: add tcp_sock_set_user_timeout"), building the kernel with OCFS2_FS=y but without INET=y causes it to fail with: ld: fs/ocfs2/cluster/tcp.o: in function `o2net_accept_many': tcp.c:(.text+0x21b1): undefined reference to `tcp_sock_set_nodelay' ld: tcp.c:(.text+0x21c1): undefined reference to `tcp_sock_set_user_timeout ' ld: fs/ocfs2/cluster/tcp.o: in function `o2net_start_connect': tcp.c:(.text+0x2633): undefined reference to `tcp_sock_set_nodelay' ld: tcp.c:(.text+0x2643): undefined reference to `tcp_sock_set_user_timeout ' This is due to tcp_sock_set_nodelay() and tcp_sock_set_user_timeout() being declared in linux/tcp.h and defined in net/ipv4/tcp.c, which depend on TCP/IP being enabled. To fix this, make OCFS2_FS depend on INET=y which already requires NET=y. Signed-off-by: Tom Seewald Reviewed-by: Joseph Qi Acked-by: Christoph Hellwig --- fs/ocfs2/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ocfs2/Kconfig b/fs/ocfs2/Kconfig index 1177c33df895..aca16624b370 100644 --- a/fs/ocfs2/Kconfig +++ b/fs/ocfs2/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config OCFS2_FS tristate "OCFS2 file system support" - depends on NET && SYSFS && CONFIGFS_FS + depends on INET && SYSFS && CONFIGFS_FS select JBD2 select CRC32 select QUOTA