3.5-stable patches

added patches:
	nfs-alias-the-nfs-module-to-nfs4.patch

diff --git a/queue-3.5/nfs-alias-the-nfs-module-to-nfs4.patch b/queue-3.5/nfs-alias-the-nfs-module-to-nfs4.patch
new file mode 100644 (file)
index 0000000..8c40f28
--- /dev/null
+++ b/queue-3.5/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
+@@ -2961,4 +2961,6 @@ static struct dentry *nfs4_referral_moun
+       return res;
+ }
+ 
++MODULE_ALIAS("nfs4");
++
+ #endif /* CONFIG_NFS_V4 */

diff --git a/queue-3.5/series b/queue-3.5/series
index ab2943fe944f822f8e91260bf094fd66c4543e2a..7b2c058890362cc04235dc7360db5b14248eba57 100644 (file)
--- a/queue-3.5/series
+++ b/queue-3.5/series
@@ -39,3 +39,4 @@ bluetooth-fix-using-null-inquiry-entry.patch
 bluetooth-fix-using-a-null-inquiry-cache-entry.patch
 bluetooth-set-name_state-to-unknown-when-entry-name-is-empty.patch
 bluetooth-fix-legacy-pairing-with-some-devices.patch
+nfs-alias-the-nfs-module-to-nfs4.patch