summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbjschuma@gmail.com <bjschuma@gmail.com>2012-08-08 13:57:10 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-14 10:00:38 -0700
commit002d4127ed4f52323b0dc6573df907a5c2c7cef0 (patch)
treed21e0c3fc4326774dd1f510dbf4d41177c10ebee
parent4ad55ffb366e07fdaefc2372e77b98569c9b4619 (diff)
downloadlinux-stable-002d4127ed4f52323b0dc6573df907a5c2c7cef0.tar.gz
linux-stable-002d4127ed4f52323b0dc6573df907a5c2c7cef0.tar.bz2
linux-stable-002d4127ed4f52323b0dc6573df907a5c2c7cef0.zip
NFS: Alias the nfs module to nfs4
commit 425e776d93a7a5070b77d4f458a5bab0f924652c upstream. This allows distros to remove the line from their modprobe configuration. Signed-off-by: Bryan Schumaker <bjschuma@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/nfs/super.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 8e7b61d5829a..d709112e1f99 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -3096,4 +3096,6 @@ static struct dentry *nfs4_referral_mount(struct file_system_type *fs_type,
return res;
}
+MODULE_ALIAS("nfs4");
+
#endif /* CONFIG_NFS_V4 */