From 3da9498ea320403ba91bc92107316c1f15ac2431 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 27 Aug 2012 14:53:13 -0700 Subject: [PATCH] 3.0-stable patches added patches: nfs-alias-the-nfs-module-to-nfs4.patch --- .../nfs-alias-the-nfs-module-to-nfs4.patch | 26 +++++++++++++++++++ queue-3.0/series | 1 + 2 files changed, 27 insertions(+) create mode 100644 queue-3.0/nfs-alias-the-nfs-module-to-nfs4.patch diff --git a/queue-3.0/nfs-alias-the-nfs-module-to-nfs4.patch b/queue-3.0/nfs-alias-the-nfs-module-to-nfs4.patch new file mode 100644 index 00000000000..b4c789859ad --- /dev/null +++ b/queue-3.0/nfs-alias-the-nfs-module-to-nfs4.patch @@ -0,0 +1,26 @@ +From: "bjschuma@gmail.com" +Date: Wed, 8 Aug 2012 13:57:10 -0400 +Subject: 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 +Signed-off-by: Trond Myklebust +[bwh: Backported to 3.2: adjust context] +Signed-off-by: Ben Hutchings +--- + fs/nfs/super.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/fs/nfs/super.c ++++ b/fs/nfs/super.c +@@ -3096,4 +3096,6 @@ static struct dentry *nfs4_referral_moun + return res; + } + ++MODULE_ALIAS("nfs4"); ++ + #endif /* CONFIG_NFS_V4 */ diff --git a/queue-3.0/series b/queue-3.0/series index dbfb8f88763..4f731184955 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -14,3 +14,4 @@ usb-winbond-remove-__devinit-from-the-struct-usb_device_id-table.patch mm-hugetlbfs-correctly-populate-shared-pmd.patch nfsv3-ensure-that-do_proc_get_root-reports-errors-correctly.patch nfsv4.1-remove-a-bogus-bug_on-in-nfs4_layoutreturn_done.patch +nfs-alias-the-nfs-module-to-nfs4.patch -- 2.47.2