From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757433Ab2IMAMZ (ORCPT ); Wed, 12 Sep 2012 20:12:25 -0400 Received: from mail-oa0-f46.google.com ([209.85.219.46]:50638 "EHLO mail-oa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932718Ab2ILXis (ORCPT ); Wed, 12 Sep 2012 19:38:48 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg KH , Bryan Schumaker , Trond Myklebust , Ben Hutchings Subject: [ 35/85] NFS: Alias the nfs module to nfs4 Date: Wed, 12 Sep 2012 16:36:18 -0700 Message-Id: <20120912233545.415421386@linuxfoundation.org> X-Mailer: git-send-email 1.7.10.1.362.g242cab3 In-Reply-To: <20120912233541.747973832@linuxfoundation.org> References: <20120912233541.747973832@linuxfoundation.org> User-Agent: quilt/0.60-2.1.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg KH 3.4-stable review patch. If anyone has any objections, please let me know. ------------------ 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 --- fs/nfs/super.c | 2 ++ 1 file changed, 2 insertions(+) --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -3146,4 +3146,6 @@ static struct dentry *nfs4_referral_moun return res; } +MODULE_ALIAS("nfs4"); + #endif /* CONFIG_NFS_V4 */