From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933083Ab2JAX2m (ORCPT ); Mon, 1 Oct 2012 19:28:42 -0400 Received: from 1wt.eu ([62.212.114.60]:35236 "EHLO 1wt.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757575Ab2JAXAs (ORCPT ); Mon, 1 Oct 2012 19:00:48 -0400 Message-Id: <20121001225203.121723717@1wt.eu> User-Agent: quilt/0.48-1 Date: Tue, 02 Oct 2012 00:54:07 +0200 From: Willy Tarreau To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Bryan Schumaker , Trond Myklebust , Ben Hutchings , Greg Kroah-Hartman , Willy Tarreau Subject: [ 130/180] NFS: Alias the nfs module to nfs4 In-Reply-To: <6a854f579a99b4fe2efaca1057e8ae22@local> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.32-longterm review patch. If anyone has any objections, please let me know. ------------------ From: bjschuma@gmail.com commit 425e776d93a7a5070b77d4f458a5bab0f924652c upstream. This allows distros to remove the line from their modprobe configuration. Signed-off-by: Bryan Schumaker Signed-off-by: Trond Myklebust [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman Signed-off-by: Willy Tarreau --- fs/nfs/super.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/fs/nfs/super.c b/fs/nfs/super.c index c346808..9a3f15b 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -2934,4 +2934,6 @@ out: return error; } +MODULE_ALIAS("nfs4"); + #endif /* CONFIG_NFS_V4 */ -- 1.7.2.1.45.g54fbc