3.0-stable patches

added patches:
	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 (file)
index 0000000..b4c7898
--- /dev/null
+++ b/queue-3.0/nfs-alias-the-nfs-module-to-nfs4.patch
@@ -0,0 +1,26 @@
+From: "bjschuma@gmail.com" <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 <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>
+---
+ 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 dbfb8f8876381f8b48c1a489b24f438c01838242..4f73118495543b64ca92748ff263cb394fba481c 100644 (file)
--- 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