From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752816AbbCKNiC (ORCPT ); Wed, 11 Mar 2015 09:38:02 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:60854 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751124AbbCKNh7 (ORCPT ); Wed, 11 Mar 2015 09:37:59 -0400 From: Arnd Bergmann To: Trond Myklebust Cc: Peng Tao , Tom Haynes , linux-nfs@vger.kernel.org, Anna Schumaker , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] nfs: do not export discarded symbols Date: Wed, 11 Mar 2015 14:37:25 +0100 Message-ID: <3173686.FPJdK9jLbA@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:x6JVes0eB6auAMgZBAFrdYbyB+ucFYO1W+bRmq6PcSLVzuph+7U vQjpTHiOIRpQhkWgn9j8rmaoMkcybWFAMHX99JVJsKnd1mKia8tIEmRyTdxbYb5ipNqug0Y 9aA82b+MktTvMojcjwysmI2tQ/TDahK/5zGnvqA8G4n2aoHkGU+1eu6Kl4C5VgFFOeSxjt8 i2d6nu3YqlXxBa0QWBEOg== X-UI-Out-Filterresults: notjunk:1; Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The function nfs4_pnfs_v3_ds_connect_unload is exported so it can be used by other modules, but is also marked '__exit' and will be discarded when built into the kernel, as pointed out by this linker error: `nfs4_pnfs_v3_ds_connect_unload' referenced in section `___ksymtab_gpl+nfs4_pnfs_v3_ds_connect_unload' of fs/built-in.o: defined in discarded section `.exit.text' of fs/built-in.o This removes the __exit annotation to make it safe to call this function. Signed-off-by: Arnd Bergmann Fixes: 5f01d9539496 ("nfs41: create NFSv3 DS connection if specified") diff --git a/fs/nfs/pnfs_nfs.c b/fs/nfs/pnfs_nfs.c index 54e36b38fb5f..8582dae5ae99 100644 --- a/fs/nfs/pnfs_nfs.c +++ b/fs/nfs/pnfs_nfs.c @@ -561,7 +561,7 @@ static bool load_v3_ds_connect(void) return(get_v3_ds_connect != NULL); } -void __exit nfs4_pnfs_v3_ds_connect_unload(void) +void nfs4_pnfs_v3_ds_connect_unload(void) { if (get_v3_ds_connect) { symbol_put(nfs3_set_ds_client);